"LCD测试",
/*factory_mode_reset.c*/
- "确定重置全部设置并删除设备上全部数据?",
+ "确定重置设备并清除全部用户数据?",
"正在恢复出厂设置",
/*factory_mode_hwtest.c*/
"LCD test",
/*factory_mode_reset.c*/
- "Make sure to reset all settings and delete all data on the device?",
+ "Make sure to reset all settings and clean user data?",
"Restoring factory settings",
/*factory_mode_hwtest.c*/
#ifdef __MMI_ZHSX_SUPPORT_ALIPAY__
case MMI_ALIPAY_MSG_HANDLE:
printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+ #if USE_LV_WATCH_ALIPAY != 0
aos_watch_alipay_msg_handle(msg);
+ #endif
break;
#endif
WATCH_TEXT_ID_LCDTEST, /* "LCD测试" "LCD Test" */
/*factory_mode_reset.c*/
- WATCH_TEXT_ID_FACTORY_RESET_Q, /* "确定重置全部设置并删除设备上全部数据？" "Make sure to reset all settings ang delete all data on the device?"*/
+ WATCH_TEXT_ID_FACTORY_RESET_Q, /* "确定重置设备并清除全部用户数据" "Make sure to reset all settings and clean user data?"*/
WATCH_TEXT_ID_FACTORY_RESETING, /* "正在恢复出厂设置" "Restoring factory settings"*/
/*factory_mode_hwtest.c*/
*********************/
#include "lv_watch.h"
+#if USE_LV_WATCH_ALIPAY != 0
+
+
#include <stdio.h>
#include <stdlib.h>
#include "lv_drv_conf.h"
}
+#endif
+
+
#include "../../../lv_ex_conf.h"
#endif
+
+#if USE_LV_WATCH_ALIPAY != 0
+
/*********************
* DEFINES
*********************/
UPAY_ALIPAY_INTED = 2,
};
+#endif
+
#ifdef __cplusplus
} /* extern "C" */
*********************/
#include "lv_watch.h"
+#if USE_LV_WATCH_ALIPAY != 0
+
+
#include <stdio.h>
#include <stdlib.h>
#include "lv_drv_conf.h"
return;
}
+#endif
+
if(NULL == obj)
return NULL;
- lv_obj_t * label = lv_label_create(obj, NULL);
- lv_obj_set_size(label, LV_HOR_RES, LV_VER_RES / 6);
- lv_label_set_text_id(label, WATCH_TEXT_ID_FACTORY_RESET);
- lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20_gray);
- lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 25);
+ //lv_obj_t * label = lv_label_create(obj, NULL);
+ //lv_obj_set_size(label, LV_HOR_RES, LV_VER_RES / 6);
+ //lv_label_set_text_id(label, WATCH_TEXT_ID_FACTORY_RESET);
+ //lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20_gray);
+ //lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 25);
lv_obj_t * label_tip = lv_label_create(obj, NULL);
lv_label_set_text_id(label_tip, WATCH_TEXT_ID_FACTORY_RESET_Q);
lv_label_set_long_mode(label_tip, LV_LABEL_LONG_BREAK);
- lv_obj_set_width(label_tip, LV_HOR_RES * 3 / 4);
- lv_obj_align(label_tip, label, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
+ //lv_obj_set_width(label_tip, LV_HOR_RES * 3 / 4);
+ //lv_obj_align(label_tip, label, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
+ lv_obj_set_width(label_tip, LV_HOR_RES * 2 / 3);
+ lv_obj_align(label_tip, obj, LV_ALIGN_IN_TOP_MID, 0, 50);
lv_obj_add_style(label_tip, LV_LABEL_PART_MAIN, &lv_watch_font26);
lv_obj_t * btn_yes = lv_imgbtn_create(obj, NULL);
/**********************
* STATIC PROTOTYPES
**********************/
-static lv_obj_t * voip_ring_off_content_create(lv_obj_t * par);
static void voip_phone_left_slide_callback(lv_obj_t * obj);
static void voip_phone_right_slide_callback(lv_obj_t * obj);
static void voip_phone_down_slide_callback(lv_obj_t * obj);
static void voip_slider_action(lv_obj_t * slider, lv_event_t e);
static void voip_phone_obj_hide_anim_end(lv_anim_t * anim);
static void voip_anim_fp_dialing_ring(lv_obj_t * obj, int32_t x);
-static void voip_get_time_elaps(uint32_t last_time, char * str, int8_t size);
static void voip_set_volume_when_slider_act(void);
static void voip_local_remote_switch_action(lv_obj_t * btn, lv_event_t e);
static void canvas_button_hidden_event_cb(lv_obj_t * obj, lv_event_t e);
mmi_vc_call_screen_clean();
}
-static lv_obj_t * voip_ring_off_content_create(lv_obj_t * par)
+static void mmi_vc_get_time_elaps(uint32_t last_time, char * str, int8_t size)
+{
+ hal_rtc_t rtc_curr; // current rtc time
+ uint32_t second_curr = 0; // seconds of current time
+
+ Hal_Rtc_Gettime(&rtc_curr);
+ second_curr = time_to_seconds(&rtc_curr);
+
+ uint32_t elaps = second_curr - last_time;
+ uint32_t seconds = elaps % 60;
+ uint32_t minutes = elaps / 60;
+ uint32_t hours = minutes / 60;
+ minutes = minutes % 60;
+
+ if(hours == 0)
+ snprintf(str, size, "%.2d:%.2d", minutes, seconds);
+ else
+ snprintf(str, size, "%.2d:%.2d:%.2d", hours, minutes, seconds);
+}
+
+static lv_obj_t * mmi_vc_ring_off_content_create(lv_obj_t * par)
{
printf("%s %d\n", __FUNCTION__, __LINE__);
if(par == NULL) {
}
lv_obj_add_style(content, LV_OBJ_PART_MAIN, &lv_watch_cont_opa1);
- lv_obj_set_size(content, 204, 44);
- if(ext->vc_ui == MMI_VC_UI_INCOMING || ext->vc_ui == MMI_VC_UI_DIALING) {
- lv_obj_align(content, obj, LV_ALIGN_IN_TOP_MID, 0, 10);
- } else {
- lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, -12);
- }
+ //lv_obj_set_size(content, 204, 44);
+ //if(ext->vc_ui == MMI_VC_UI_INCOMING || ext->vc_ui == MMI_VC_UI_DIALING) {
+ // lv_obj_align(content, obj, LV_ALIGN_IN_TOP_MID, 0, 10);
+ //} else {
+ // lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, -12);
+ //}
+ lv_obj_set_size(content, LV_HOR_RES - 40, 50);
+ lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, -10);
lv_cont_set_layout(content, LV_LAYOUT_CENTER);
lv_obj_set_click(content, false);
lv_obj_t * label = lv_label_create(content, NULL);
- lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font20);
+ lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26); // &lv_watch_font20);
lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
if(is_rat_gsm())
{
char tmp[20] = "";
char str[30] = "";
- voip_get_time_elaps(ext->connect_start_time, tmp, 20);
+ mmi_vc_get_time_elaps(ext->connect_start_time, tmp, 20);
snprintf(str, 30, "%s(%s)", (char *)lv_lang_get_text(WATCH_TEXT_ID_RING_OFF), tmp);
lv_label_set_text(label, str);
}
}
char str[20] = "";
- voip_get_time_elaps(ext->connect_start_time, str, 20);
+ mmi_vc_get_time_elaps(ext->connect_start_time, str, 20);
if(obj) {
lv_label_set_text(obj, str);
}
lv_anim_start(&a);
}
-static void voip_get_time_elaps(uint32_t last_time, char * str, int8_t size)
-{
- hal_rtc_t rtc_curr; // current rtc time
- uint32_t second_curr = 0; // seconds of current time
-
- Hal_Rtc_Gettime(&rtc_curr);
- second_curr = time_to_seconds(&rtc_curr);
-
- uint32_t elaps = second_curr - last_time;
- uint32_t seconds = elaps % 60;
- uint32_t minutes = elaps / 60;
- uint32_t hours = minutes / 60;
- minutes = minutes % 60;
-
- if(hours == 0) {
- if(lv_lang_act() == LANG_CH) {
- snprintf(str, size, "%.2d:%.2d", minutes, seconds);
- } else {
- snprintf(str, size, "%.2d:%.2d", minutes, seconds);
- }
- } else {
- if(lv_lang_act() == LANG_CH) {
- snprintf(str, size, "%.2d:%.2d:%.2d", hours, minutes, seconds);
- } else {
- snprintf(str, size, "%.2d:%.2d:%.2d", hours, minutes, seconds);
- }
- }
-}
-
void mmi_vc_ring_off_no_carrier(uint8_t isNoCarrier)
{
if((false == s_video_call_params.ring_off_timeout)
lv_label_set_text(ext->phone_status_label, "");
}
- voip_ring_off_content_create(mmi_vc_call_get_obj());
+ mmi_vc_ring_off_content_create(mmi_vc_call_get_obj());
}
else if(ext->vc_ui == MMI_VC_UI_CONNECTED)
{
- voip_ring_off_content_create(mmi_vc_call_get_obj());
+ mmi_vc_ring_off_content_create(mmi_vc_call_get_obj());
}
if(ext->phone_animation_obj) {
{
lv_label_set_text(label, s_video_call_params.number);
}
- lv_obj_align(label, img, LV_ALIGN_OUT_BOTTOM_MID, 0, 20);
+ lv_obj_align(label, img, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
lv_obj_set_click(label, false);
#if 0
return;
}
+ if(true == mmi_video_call_is_in_call())
+ {
+ return;
+ }
+
if(true == mmi_vc_check_mo_permission())
{
uint8_t index = lv_watch_get_free_num(btn);
return;
}
+ if(true == mmi_video_call_is_in_call())
+ {
+ return;
+ }
+
if(true == mmi_vc_check_mo_permission())
{
uint8_t index = lv_watch_get_free_num(btn);
lv_obj_t * voicebtn = lv_imgbtn_create(cont, NULL);
lv_imgbtn_set_src(voicebtn, LV_BTN_STATE_RELEASED, ICON_VIDEO_CALL_VOICE_BTN);
lv_imgbtn_set_src(voicebtn, LV_BTN_STATE_PRESSED, ICON_VIDEO_CALL_VOICE_BTN);
+#ifdef USE_LV_WATCH_UI_240_240_CIRCLE
+ lv_obj_align(voicebtn, cont, LV_ALIGN_IN_LEFT_MID, 5, 0);
+#else
lv_obj_align(voicebtn, cont, LV_ALIGN_IN_TOP_MID, 0, 10);
+#endif
lv_obj_set_event_cb(voicebtn, mmi_vc_voice_btn_action);
lv_watch_set_free_num(voicebtn, index);
lv_obj_t * videobtn = lv_imgbtn_create(cont, NULL);
lv_imgbtn_set_src(videobtn, LV_BTN_STATE_RELEASED, ICON_VIDEO_CALL_VIDEO_BTN);
lv_imgbtn_set_src(videobtn, LV_BTN_STATE_PRESSED, ICON_VIDEO_CALL_VIDEO_BTN);
+#ifdef USE_LV_WATCH_UI_240_240_CIRCLE
+ lv_obj_align(videobtn, cont, LV_ALIGN_IN_RIGHT_MID, -5, 0);
+#else
lv_obj_align(videobtn, cont, LV_ALIGN_IN_BOTTOM_MID, 0, -10);
+#endif
lv_obj_set_event_cb(videobtn, mmi_vc_video_btn_action);
lv_watch_set_free_num(videobtn, index);
}
/**********************
* STATIC PROTOTYPES
**********************/
-static lv_obj_t * voip_ring_off_content_create(lv_obj_t * par);
static void voip_phone_left_slide_callback(lv_obj_t * obj);
static void voip_phone_right_slide_callback(lv_obj_t * obj);
static void voip_phone_down_slide_callback(lv_obj_t * obj);
static void voip_slider_action(lv_obj_t * slider, lv_event_t e);
static void voip_phone_obj_hide_anim_end(lv_anim_t * anim);
static void voip_anim_fp_dialing_ring(lv_obj_t * obj, int32_t x);
-static void voip_get_time_elaps(uint32_t last_time, char * str, int8_t size);
static void voip_set_volume_when_slider_act(void);
static void voip_local_remote_switch_action(lv_obj_t * btn, lv_event_t e);
static void canvas_button_hidden_event_cb(lv_obj_t * obj, lv_event_t e);
{
return;
}
- mmi_vc_activity_destroy_req_fzd();
+ mmi_vc_activity_destroy_req();
Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2);
}
}
mmi_vc_call_screen_clean();
}
-static lv_obj_t * voip_ring_off_content_create(lv_obj_t * par)
+static void mmi_vc_get_time_elaps(uint32_t last_time, char * str, int8_t size)
+{
+ hal_rtc_t rtc_curr; // current rtc time
+ uint32_t second_curr = 0; // seconds of current time
+
+ Hal_Rtc_Gettime(&rtc_curr);
+ second_curr = time_to_seconds(&rtc_curr);
+
+ uint32_t elaps = second_curr - last_time;
+ uint32_t seconds = elaps % 60;
+ uint32_t minutes = elaps / 60;
+ uint32_t hours = minutes / 60;
+ minutes = minutes % 60;
+
+ if(hours == 0)
+ snprintf(str, size, "%.2d:%.2d", minutes, seconds);
+ else
+ snprintf(str, size, "%.2d:%.2d:%.2d", hours, minutes, seconds);
+}
+
+static lv_obj_t * mmi_vc_ring_off_content_create(lv_obj_t * par)
{
printf("%s %d\n", __FUNCTION__, __LINE__);
if(par == NULL) {
}
lv_obj_add_style(content, LV_OBJ_PART_MAIN, &lv_watch_cont_opa1);
- lv_obj_set_size(content, 204, 44);
- if(ext->vc_ui == MMI_VC_UI_INCOMING || ext->vc_ui == MMI_VC_UI_DIALING) {
- lv_obj_align(content, obj, LV_ALIGN_IN_TOP_MID, 0, 10);
- } else {
- lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, -12);
- }
+ //lv_obj_set_size(content, 204, 44);
+ //if(ext->vc_ui == MMI_VC_UI_INCOMING || ext->vc_ui == MMI_VC_UI_DIALING) {
+ // lv_obj_align(content, obj, LV_ALIGN_IN_TOP_MID, 0, 10);
+ //} else {
+ // lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, -12);
+ //}
+ lv_obj_set_size(content, LV_HOR_RES - 40, 50);
+ lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, -10);
lv_cont_set_layout(content, LV_LAYOUT_CENTER);
lv_obj_set_click(content, false);
lv_obj_t * label = lv_label_create(content, NULL);
- lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font20);
+ lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26); // &lv_watch_font20);
lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
if(is_rat_gsm())
{
char tmp[20] = "";
char str[30] = "";
- voip_get_time_elaps(ext->connect_start_time, tmp, 20);
+ mmi_vc_get_time_elaps(ext->connect_start_time, tmp, 20);
snprintf(str, 30, "%s(%s)", (char *)lv_lang_get_text(WATCH_TEXT_ID_RING_OFF), tmp);
lv_label_set_text(label, str);
}
}
char str[20] = "";
- voip_get_time_elaps(ext->connect_start_time, str, 20);
+ mmi_vc_get_time_elaps(ext->connect_start_time, str, 20);
if(obj) {
lv_label_set_text(obj, str);
}
lv_anim_start(&a);
}
-static void voip_get_time_elaps(uint32_t last_time, char * str, int8_t size)
-{
- hal_rtc_t rtc_curr; // current rtc time
- uint32_t second_curr = 0; // seconds of current time
-
- Hal_Rtc_Gettime(&rtc_curr);
- second_curr = time_to_seconds(&rtc_curr);
-
- uint32_t elaps = second_curr - last_time;
- uint32_t seconds = elaps % 60;
- uint32_t minutes = elaps / 60;
- uint32_t hours = minutes / 60;
- minutes = minutes % 60;
-
- if(hours == 0) {
- if(lv_lang_act() == LANG_CH) {
- snprintf(str, size, "%.2d:%.2d", minutes, seconds);
- } else {
- snprintf(str, size, "%.2d:%.2d", minutes, seconds);
- }
- } else {
- if(lv_lang_act() == LANG_CH) {
- snprintf(str, size, "%.2d:%.2d:%.2d", hours, minutes, seconds);
- } else {
- snprintf(str, size, "%.2d:%.2d:%.2d", hours, minutes, seconds);
- }
- }
-}
-
void mmi_vc_ring_off_no_carrier(uint8_t isNoCarrier)
{
if((false == s_video_call_params.ring_off_timeout)
printf("%s\n", __FUNCTION__);
if(lv_watch_get_activity_obj(ACT_ID_SLIDER)) {
if(MMI_VIDEO_CALL_STATE_NONE != s_video_call_params.state) {
- uint8_t volume = mmi_vc_get_call_volume_fzd();
+ uint8_t volume = mmi_vc_get_call_volume();
printf("set nv, speaker volume is %d.\n", volume);
UI_NV_Write_Req(NV_SECTION_UI_PHONE, 0, 1, &volume);
}
lv_label_set_text(ext->phone_status_label, "");
}
- voip_ring_off_content_create(mmi_vc_call_get_obj());
+ mmi_vc_ring_off_content_create(mmi_vc_call_get_obj());
}
else if(ext->vc_ui == MMI_VC_UI_CONNECTED)
{
- voip_ring_off_content_create(mmi_vc_call_get_obj());
+ mmi_vc_ring_off_content_create(mmi_vc_call_get_obj());
}
if(ext->phone_animation_obj) {
{
lv_label_set_text(label, s_video_call_params.number);
}
- lv_obj_align(label, img, LV_ALIGN_OUT_BOTTOM_MID, 0, 20);
+ lv_obj_align(label, img, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
lv_obj_set_click(label, false);
#if 0
lv_obj_t * voicebtn = lv_imgbtn_create(cont, NULL);
lv_imgbtn_set_src(voicebtn, LV_BTN_STATE_RELEASED, ICON_VIDEO_CALL_VOICE_BTN);
lv_imgbtn_set_src(voicebtn, LV_BTN_STATE_PRESSED, ICON_VIDEO_CALL_VOICE_BTN);
+#ifdef USE_LV_WATCH_UI_240_240_CIRCLE
+ lv_obj_align(voicebtn, cont, LV_ALIGN_IN_LEFT_MID, 5, 0);
+#else
lv_obj_align(voicebtn, cont, LV_ALIGN_IN_TOP_MID, 0, 10);
+#endif
lv_obj_set_event_cb(voicebtn, mmi_vc_voice_btn_action);
lv_watch_set_free_num(voicebtn, index);
lv_obj_t * videobtn = lv_imgbtn_create(cont, NULL);
lv_imgbtn_set_src(videobtn, LV_BTN_STATE_RELEASED, ICON_VIDEO_CALL_VIDEO_BTN);
lv_imgbtn_set_src(videobtn, LV_BTN_STATE_PRESSED, ICON_VIDEO_CALL_VIDEO_BTN);
+#ifdef USE_LV_WATCH_UI_240_240_CIRCLE
+ lv_obj_align(videobtn, cont, LV_ALIGN_IN_RIGHT_MID, -5, 0);
+#else
lv_obj_align(videobtn, cont, LV_ALIGN_IN_BOTTOM_MID, 0, -10);
+#endif
lv_obj_set_event_cb(videobtn, mmi_vc_video_btn_action);
lv_watch_set_free_num(videobtn, index);
}
//interface
-uint8_t mmi_vc_get_call_volume_fzd(void)
+uint8_t mmi_vc_get_call_volume(void)
{
return(s_video_call_params.speaker_volume);
}
-bool mmi_vc_watch_suspend_check_fzd(void)
+bool mmi_vc_watch_suspend_check(void)
{
if((s_video_call_params.call_type == MODEM_VIDEO_CALL_TYPE_VIDEO)
|| (MMI_VIDEO_CALL_STATE_INCOMING == s_video_call_params.state)
return true;
}
-bool mmi_vc_connect_check_req_fzd(void)
+bool mmi_vc_connect_check_req(void)
{
if(mmi_vc_call_get_activity_obj())
{
return false;
}
-void mmi_vc_activity_destroy_req_fzd(void)
+void mmi_vc_activity_destroy_req(void)
{
VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
void video_call_create_event_cb(lv_obj_t *btn, lv_event_t e);
-bool mmi_vc_connect_check_req_fzd(void);
-bool mmi_vc_watch_suspend_check_fzd(void);
-void mmi_vc_activity_destroy_req_fzd(void);
-uint8_t mmi_vc_get_call_volume_fzd(void);
+bool mmi_vc_connect_check_req(void);
+bool mmi_vc_watch_suspend_check(void);
+void mmi_vc_activity_destroy_req(void);
+uint8_t mmi_vc_get_call_volume(void);
#endif
/**********************
* STATIC PROTOTYPES
**********************/
-static lv_obj_t * voip_ring_off_content_create(lv_obj_t * par);
static void voip_phone_left_slide_callback(lv_obj_t * obj);
static void voip_phone_right_slide_callback(lv_obj_t * obj);
static void voip_phone_down_slide_callback(lv_obj_t * obj);
static void voip_slider_action(lv_obj_t * slider, lv_event_t e);
static void voip_phone_obj_hide_anim_end(lv_anim_t * anim);
static void voip_anim_fp_dialing_ring(lv_obj_t * obj, int32_t x);
-static void voip_get_time_elaps(uint32_t last_time, char * str, int8_t size);
static void voip_set_volume_when_slider_act(void);
static void voip_local_remote_switch_action(lv_obj_t * btn, lv_event_t e);
static void canvas_button_hidden_event_cb(lv_obj_t * obj, lv_event_t e);
{
return;
}
- mmi_vc_activity_destroy_req_tongxin();
+ mmi_vc_activity_destroy_req();
Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_2);
}
}
mmi_vc_call_screen_clean();
}
-static lv_obj_t * voip_ring_off_content_create(lv_obj_t * par)
+static void mmi_vc_get_time_elaps(uint32_t last_time, char * str, int8_t size)
+{
+ hal_rtc_t rtc_curr; // current rtc time
+ uint32_t second_curr = 0; // seconds of current time
+
+ Hal_Rtc_Gettime(&rtc_curr);
+ second_curr = time_to_seconds(&rtc_curr);
+
+ uint32_t elaps = second_curr - last_time;
+ uint32_t seconds = elaps % 60;
+ uint32_t minutes = elaps / 60;
+ uint32_t hours = minutes / 60;
+ minutes = minutes % 60;
+
+ if(hours == 0)
+ snprintf(str, size, "%.2d:%.2d", minutes, seconds);
+ else
+ snprintf(str, size, "%.2d:%.2d:%.2d", hours, minutes, seconds);
+}
+
+static lv_obj_t * mmi_vc_ring_off_content_create(lv_obj_t * par)
{
printf("%s %d\n", __FUNCTION__, __LINE__);
if(par == NULL) {
}
lv_obj_add_style(content, LV_OBJ_PART_MAIN, &lv_watch_cont_opa1);
- lv_obj_set_size(content, 204, 44);
- if(ext->vc_ui == MMI_VC_UI_INCOMING || ext->vc_ui == MMI_VC_UI_DIALING) {
- lv_obj_align(content, obj, LV_ALIGN_IN_TOP_MID, 0, 10);
- } else {
- lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, -12);
- }
+ //lv_obj_set_size(content, 204, 44);
+ //if(ext->vc_ui == MMI_VC_UI_INCOMING || ext->vc_ui == MMI_VC_UI_DIALING) {
+ // lv_obj_align(content, obj, LV_ALIGN_IN_TOP_MID, 0, 10);
+ //} else {
+ // lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, -12);
+ //}
+ lv_obj_set_size(content, LV_HOR_RES - 40, 50);
+ lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, -10);
lv_cont_set_layout(content, LV_LAYOUT_CENTER);
lv_obj_set_click(content, false);
lv_obj_t * label = lv_label_create(content, NULL);
- lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font20);
+ lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26); // &lv_watch_font20);
lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
if(is_rat_gsm())
{
char tmp[20] = "";
char str[30] = "";
- voip_get_time_elaps(ext->connect_start_time, tmp, 20);
+ mmi_vc_get_time_elaps(ext->connect_start_time, tmp, 20);
snprintf(str, 30, "%s(%s)", (char *)lv_lang_get_text(WATCH_TEXT_ID_RING_OFF), tmp);
lv_label_set_text(label, str);
}
}
char str[20] = "";
- voip_get_time_elaps(ext->connect_start_time, str, 20);
+ mmi_vc_get_time_elaps(ext->connect_start_time, str, 20);
if(obj) {
lv_label_set_text(obj, str);
}
lv_anim_start(&a);
}
-static void voip_get_time_elaps(uint32_t last_time, char * str, int8_t size)
-{
- hal_rtc_t rtc_curr; // current rtc time
- uint32_t second_curr = 0; // seconds of current time
-
- Hal_Rtc_Gettime(&rtc_curr);
- second_curr = time_to_seconds(&rtc_curr);
-
- uint32_t elaps = second_curr - last_time;
- uint32_t seconds = elaps % 60;
- uint32_t minutes = elaps / 60;
- uint32_t hours = minutes / 60;
- minutes = minutes % 60;
-
- if(hours == 0) {
- if(lv_lang_act() == LANG_CH) {
- snprintf(str, size, "%.2d:%.2d", minutes, seconds);
- } else {
- snprintf(str, size, "%.2d:%.2d", minutes, seconds);
- }
- } else {
- if(lv_lang_act() == LANG_CH) {
- snprintf(str, size, "%.2d:%.2d:%.2d", hours, minutes, seconds);
- } else {
- snprintf(str, size, "%.2d:%.2d:%.2d", hours, minutes, seconds);
- }
- }
-}
-
void mmi_vc_ring_off_no_carrier(uint8_t isNoCarrier)
{
if((false == s_video_call_params.ring_off_timeout)
printf("%s\n", __FUNCTION__);
if(lv_watch_get_activity_obj(ACT_ID_SLIDER)) {
if(MMI_VIDEO_CALL_STATE_NONE != s_video_call_params.state) {
- uint8_t volume = mmi_vc_get_call_volume_tongxin();
+ uint8_t volume = mmi_vc_get_call_volume();
printf("set nv, speaker volume is %d.\n", volume);
UI_NV_Write_Req(NV_SECTION_UI_PHONE, 0, 1, &volume);
}
lv_label_set_text(ext->phone_status_label, "");
}
- voip_ring_off_content_create(mmi_vc_call_get_obj());
+ mmi_vc_ring_off_content_create(mmi_vc_call_get_obj());
}
else if(ext->vc_ui == MMI_VC_UI_CONNECTED)
{
- voip_ring_off_content_create(mmi_vc_call_get_obj());
+ mmi_vc_ring_off_content_create(mmi_vc_call_get_obj());
}
if(ext->phone_animation_obj) {
{
lv_label_set_text(label, s_video_call_params.number);
}
- lv_obj_align(label, img, LV_ALIGN_OUT_BOTTOM_MID, 0, 20);
+ lv_obj_align(label, img, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
lv_obj_set_click(label, false);
#if 0
lv_obj_t * voicebtn = lv_imgbtn_create(cont, NULL);
lv_imgbtn_set_src(voicebtn, LV_BTN_STATE_RELEASED, ICON_VIDEO_CALL_VOICE_BTN);
lv_imgbtn_set_src(voicebtn, LV_BTN_STATE_PRESSED, ICON_VIDEO_CALL_VOICE_BTN);
+#ifdef USE_LV_WATCH_UI_240_240_CIRCLE
+ lv_obj_align(voicebtn, cont, LV_ALIGN_IN_LEFT_MID, 5, 0);
+#else
lv_obj_align(voicebtn, cont, LV_ALIGN_IN_TOP_MID, 0, 10);
+#endif
lv_obj_set_event_cb(voicebtn, mmi_vc_voice_btn_action);
lv_watch_set_free_num(voicebtn, index);
lv_obj_t * videobtn = lv_imgbtn_create(cont, NULL);
lv_imgbtn_set_src(videobtn, LV_BTN_STATE_RELEASED, ICON_VIDEO_CALL_VIDEO_BTN);
lv_imgbtn_set_src(videobtn, LV_BTN_STATE_PRESSED, ICON_VIDEO_CALL_VIDEO_BTN);
+#ifdef USE_LV_WATCH_UI_240_240_CIRCLE
+ lv_obj_align(videobtn, cont, LV_ALIGN_IN_RIGHT_MID, -5, 0);
+#else
lv_obj_align(videobtn, cont, LV_ALIGN_IN_BOTTOM_MID, 0, -10);
+#endif
lv_obj_set_event_cb(videobtn, mmi_vc_video_btn_action);
lv_watch_set_free_num(videobtn, index);
}
//interface
-uint8_t mmi_vc_get_call_volume_tongxin(void)
+uint8_t mmi_vc_get_call_volume(void)
{
return(s_video_call_params.speaker_volume);
}
-bool mmi_vc_watch_suspend_check_tongxin(void)
+bool mmi_vc_watch_suspend_check(void)
{
if((s_video_call_params.call_type == MODEM_VIDEO_CALL_TYPE_VIDEO)
|| (MMI_VIDEO_CALL_STATE_INCOMING == s_video_call_params.state)
return true;
}
-bool mmi_vc_connect_check_req_tongxin(void)
+bool mmi_vc_connect_check_req(void)
{
if(mmi_vc_call_get_activity_obj())
{
return false;
}
-void mmi_vc_activity_destroy_req_tongxin(void)
+void mmi_vc_activity_destroy_req(void)
{
VIDEO_CALL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
void video_call_create_event_cb(lv_obj_t *btn, lv_event_t e);
-bool mmi_vc_connect_check_req_tongxin(void);
-bool mmi_vc_watch_suspend_check_tongxin(void);
-void mmi_vc_activity_destroy_req_tongxin(void);
-uint8_t mmi_vc_get_call_volume_tongxin(void);
+bool mmi_vc_connect_check_req(void);
+bool mmi_vc_watch_suspend_check(void);
+void mmi_vc_activity_destroy_req(void);
+uint8_t mmi_vc_get_call_volume(void);
#endif
if(NULL == obj)
return NULL;
- label = lv_label_create(obj, NULL);
- lv_obj_set_size(label, LV_HOR_RES, LV_VER_RES / 6);
- lv_label_set_text_id(label, WATCH_TEXT_ID_RESTART);
- lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20_gray);
- lv_obj_align(label, obj, LV_ALIGN_IN_TOP_MID, 0, 25);
+ //label = lv_label_create(obj, NULL);
+ //lv_obj_set_size(label, LV_HOR_RES, LV_VER_RES / 6);
+ //lv_label_set_text_id(label, WATCH_TEXT_ID_RESTART);
+ //lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20_gray);
+ //lv_obj_align(label, obj, LV_ALIGN_IN_TOP_MID, 0, 25);
content = lv_cont_create(obj, NULL);
lv_obj_add_style(content, LV_CONT_PART_MAIN, &lv_watch_style_transp);
lv_cont_set_fit(content, LV_FIT_TIGHT);
lv_cont_set_layout(content, LV_LAYOUT_CENTER);
- lv_obj_align(content, label, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
+ //lv_obj_align(content, label, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
+ lv_obj_align(content, obj, LV_ALIGN_IN_TOP_MID, 0, 50);
lv_obj_set_click(content, false);
lv_watch_obj_add_element(content);
projects / mirrors / ASR3603_Z5.git / commitdiff