From: CCC <2393524978@qq.com> Date: Fri, 8 Dec 2023 07:54:06 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=418f0cbdb613234410f1a08266ede0c4ec37c9e6;p=mirrors%2FASR3603_Z5.git gengxin --- diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c b/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c index 3996d575..e537a2db 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c @@ -120,7 +120,7 @@ lv_obj_t * alarm_list_create(lv_obj_t * activity_obj) lv_obj_set_event_cb(btn_add, alarm_list_add_btn_action); lv_obj_t * list = lv_list_create(obj, NULL); -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#ifdef USE_LV_WATCH_UI_CIRCLE lv_obj_set_size(list, LV_HOR_RES - 40, LV_VER_RES*4/5 - 30); #else lv_obj_set_size(list, LV_HOR_RES, LV_VER_RES*4/5); @@ -300,7 +300,7 @@ static lv_obj_t * alarm_list_add(lv_obj_t * list, app_adaptor_alarm_t * alarm, u uint8_t pad_w = w - lv_obj_get_style_pad_left(list, LV_LIST_PART_SCROLLABLE); #if USE_LV_WATCH_UI_240_320 lv_obj_set_size(btn, pad_w, LV_VER_RES / 8 + LV_VER_RES / 8); -#elif defined(USE_LV_WATCH_UI_240_240_CIRCLE) +#elif defined(USE_LV_WATCH_UI_CIRCLE) lv_obj_set_size(btn, pad_w, 56 + 4); #else lv_obj_set_size(btn, pad_w, 56); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/album/album.c b/2.sdk/sdk/gui/lv_watch/lv_apps/album/album.c index eb16ed83..e5708951 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/album/album.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/album/album.c @@ -766,7 +766,7 @@ static lv_obj_t * album_photo_bg_create(lv_obj_t * par) lv_obj_set_style_local_bg_opa(cont, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP); lv_obj_set_style_local_pad_left(cont, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0); lv_obj_set_style_local_pad_right(cont, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0); -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#ifdef USE_LV_WATCH_UI_CIRCLE lv_cont_set_layout(cont, LV_LAYOUT_OFF); #else lv_cont_set_layout(cont, LV_LAYOUT_ROW_MID); @@ -802,7 +802,7 @@ static lv_obj_t * album_photo_bg_create(lv_obj_t * par) printf("[@CHENG_DEBUG][%s][%d]: w=%d, h=%d, x=%d, y=%d\n", __FUNCTION__, __LINE__, lv_obj_get_width(cont), lv_obj_get_height(cont), lv_obj_get_x(cont), lv_obj_get_y(cont)); -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#ifdef USE_LV_WATCH_UI_CIRCLE lv_obj_set_hidden(img_back, true); lv_obj_set_hidden(img_setting, true); lv_obj_align(label_ph, NULL, LV_ALIGN_CENTER, 0, 0); @@ -814,7 +814,7 @@ static lv_obj_t * album_photo_bg_create(lv_obj_t * par) static void album_photo_item_create(lv_obj_t * par) { lv_album_obj_ext_t * ext = album_get_ext(); -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#ifdef USE_LV_WATCH_UI_CIRCLE uint8_t line = ext->photo_cnt % 2 == 0 ? ext->photo_cnt / 2 : ext->photo_cnt / 2 + 1; #else uint8_t line = ext->photo_cnt % 3 == 0 ? ext->photo_cnt / 3 : ext->photo_cnt / 3 + 1; @@ -822,7 +822,7 @@ static void album_photo_item_create(lv_obj_t * par) ext->img_page = lv_page_create(par, NULL); //lv_obj_set_size(ext->img_page, LV_HOR_RES, 200); -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#ifdef USE_LV_WATCH_UI_CIRCLE lv_obj_set_size(ext->img_page, 165, 155); lv_obj_align(ext->img_page, NULL, LV_ALIGN_IN_TOP_MID, 0, 45); #else @@ -958,7 +958,7 @@ static void album_view_photo_opt_create(lv_obj_t * img_view) { lv_obj_t * img_back = lv_img_create(img_view, NULL); lv_img_set_src(img_back, ICON_ALBUM_BACK); -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#ifdef USE_LV_WATCH_UI_CIRCLE if(lv_obj_get_base_dir(img_view) == LV_BIDI_DIR_RTL) { lv_obj_align(img_back, NULL, LV_ALIGN_IN_TOP_MID, 0, 0); lv_img_set_angle(img_back, 1800); @@ -989,7 +989,7 @@ static void album_view_photo_opt_create(lv_obj_t * img_view) lv_obj_t * img_del = lv_img_create(img_view, NULL); lv_img_set_src(img_del, ICON_ALBUM_DELETE_GRAY); -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#ifdef USE_LV_WATCH_UI_CIRCLE lv_obj_align(img_del, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, 0); #else if(lv_obj_get_base_dir(img_view) == LV_BIDI_DIR_RTL) @@ -1242,7 +1242,7 @@ static void album_setting_delete_create(lv_obj_t * par, uint8_t del_one) else lv_obj_add_style(label_q, LV_LABEL_PART_MAIN, &lv_watch_font20_black); //lv_obj_align(label_q, img_to_del, LV_ALIGN_OUT_BOTTOM_MID, 0, 15); -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#ifdef USE_LV_WATCH_UI_CIRCLE lv_obj_set_hidden(img_to_del, true); lv_obj_align(label_q, NULL, LV_ALIGN_CENTER, 0, -25); #else diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/alipay/alipay.c b/2.sdk/sdk/gui/lv_watch/lv_apps/alipay/alipay.c index 6124ee30..6cd26468 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/alipay/alipay.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/alipay/alipay.c @@ -63,7 +63,24 @@ static void upay_parent_list_prepare_destory(lv_obj_t * activity_obj); **********************/ #ifdef __MMI_ZHSX_SUPPORT_ALIPAY__ -#if USE_LV_WATCH_UI_240_320 +#ifdef USE_LV_WATCH_UI_CIRCLE + +#if USE_LV_WATCH_UI_240_240 +#define MMI_ALIPAY_QRCODE_BG_WIDTH (126+12) +#define QRCODE_WIDTH (126) +#define PARENT_CTRL_QRCODE_WIDTH (126) +#define BIND_QRCODE_WIDTH (126) +#define COLLECT_QRCODE_WIDTH (126) + + +#define MMI_ALIPAY_BIND_PROMPT_Y (15 + 18) +#define MMI_ALIPAY_BIND_QRCODE_BG_Y (15) + +#define MMI_ALIPAY_COLLECT_QRCODE_Y (0) + +#define MMI_ALIPAY_PAY_RESULT_BTN_Y (-10) + +#else #define MMI_ALIPAY_QRCODE_BG_WIDTH (180) #define QRCODE_WIDTH 150 #define PARENT_CTRL_QRCODE_WIDTH 150 @@ -76,7 +93,12 @@ static void upay_parent_list_prepare_destory(lv_obj_t * activity_obj); #define MMI_ALIPAY_COLLECT_QRCODE_Y (-10) -#elif USE_LV_WATCH_UI_240_280 +#define MMI_ALIPAY_PAY_RESULT_BTN_Y (0) +#endif + +#else + +#if USE_LV_WATCH_UI_240_320 #define MMI_ALIPAY_QRCODE_BG_WIDTH (180) #define QRCODE_WIDTH 150 #define PARENT_CTRL_QRCODE_WIDTH 150 @@ -84,24 +106,28 @@ static void upay_parent_list_prepare_destory(lv_obj_t * activity_obj); #define COLLECT_QRCODE_WIDTH 150 -#define MMI_ALIPAY_BIND_PROMPT_Y (15 + 15) +#define MMI_ALIPAY_BIND_PROMPT_Y (15 + 40) #define MMI_ALIPAY_BIND_QRCODE_BG_Y (15) -#define MMI_ALIPAY_COLLECT_QRCODE_Y (0) +#define MMI_ALIPAY_COLLECT_QRCODE_Y (-10) -#elif USE_LV_WATCH_UI_240_240_CIRCLE -#define MMI_ALIPAY_QRCODE_BG_WIDTH (126+12) -#define QRCODE_WIDTH (126) -#define PARENT_CTRL_QRCODE_WIDTH (126) -#define BIND_QRCODE_WIDTH (126) -#define COLLECT_QRCODE_WIDTH (126) +#define MMI_ALIPAY_PAY_RESULT_BTN_Y (0) +#elif USE_LV_WATCH_UI_240_280 +#define MMI_ALIPAY_QRCODE_BG_WIDTH (180) +#define QRCODE_WIDTH 150 +#define PARENT_CTRL_QRCODE_WIDTH 150 +#define BIND_QRCODE_WIDTH 150 +#define COLLECT_QRCODE_WIDTH 150 -#define MMI_ALIPAY_BIND_PROMPT_Y (15 + 18) + +#define MMI_ALIPAY_BIND_PROMPT_Y (15 + 15) #define MMI_ALIPAY_BIND_QRCODE_BG_Y (15) #define MMI_ALIPAY_COLLECT_QRCODE_Y (0) +#define MMI_ALIPAY_PAY_RESULT_BTN_Y (0) + #else #define MMI_ALIPAY_QRCODE_BG_WIDTH (180) #define QRCODE_WIDTH 150 @@ -114,6 +140,10 @@ static void upay_parent_list_prepare_destory(lv_obj_t * activity_obj); #define MMI_ALIPAY_BIND_QRCODE_BG_Y (15) #define MMI_ALIPAY_COLLECT_QRCODE_Y (-10) + +#define MMI_ALIPAY_PAY_RESULT_BTN_Y (0) +#endif + #endif #else @@ -303,15 +333,19 @@ void mmi_identify_info_do(void) } static lv_task_t * s_alipay_task_p; -static uint8_t s_id2_init_result = 0; static void mmi_watch_alipay_id2_init(void) { int32_t ret = aos_start_simcard_identify(); - ALIPAY_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: ret=%d\n", __FUNCTION__, __LINE__, ret); + ALIPAY_DEBUG_PRINTF("[%s][%d]: ret=%d\n", __FUNCTION__, __LINE__, ret); + + //uint8_t id2_st = 0; + //upay_id2_init(); + //upay_id2_check_status(&id2_st); + //ALIPAY_DEBUG_PRINTF("[%s][%d]: id2_st=%d\n", __FUNCTION__, __LINE__, id2_st); ret = aos_upay_check_id2(); - ALIPAY_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: ret=%d\n", __FUNCTION__, __LINE__, ret); + ALIPAY_DEBUG_PRINTF("[%s][%d]: ret=%d\n", __FUNCTION__, __LINE__, ret); if(ret) { if(alipay_init_flag == UPAY_ALIPAY_IDE) @@ -326,11 +360,14 @@ static void mmi_watch_alipay_id2_init(void) aos_mutex_unlock(&alipay_init_task_lock); } - s_id2_init_result = 1; + lv_task_del(s_alipay_task_p); + s_alipay_task_p = NULL; + + ALIPAY_DEBUG_PRINTF("[%s][%d]: ID2 init\n", __FUNCTION__, __LINE__); } else { - ALIPAY_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: ID2 error\n", __FUNCTION__, __LINE__); + ALIPAY_DEBUG_PRINTF("[%s][%d]: ID2 error\n", __FUNCTION__, __LINE__); } } @@ -346,15 +383,14 @@ static void mmi_watch_alipay_init_task(lv_task_t * task) init_lock_st = 1; } + mmi_identify_info_do(); + bind_st = upay_check_bind_status(); - ALIPAY_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: bind_st=%d\n", __FUNCTION__, __LINE__, bind_st); + ALIPAY_DEBUG_PRINTF("[%s][%d]: bind_st=%d\n", __FUNCTION__, __LINE__, bind_st); - if((NULL != netif_get_default_nw()) && (UPAY_RC_TRUE != bind_st)) + if(NULL != netif_get_default_nw()) { mmi_watch_alipay_id2_init(); - - lv_task_del(s_alipay_task_p); - s_alipay_task_p = NULL; } } @@ -362,32 +398,18 @@ void mmi_watch_alipay_info_init(void) { if(false == watch_modem_sim_present_check_req()) { - ALIPAY_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); + ALIPAY_DEBUG_PRINTF("[%s][%d]: no sim\n", __FUNCTION__, __LINE__); return; } - mmi_identify_info_do(); - s_alipay_task_p = lv_task_create(mmi_watch_alipay_init_task, 3000, LV_TASK_PRIO_MID, NULL); + upay_id2_init(); + s_alipay_task_p = lv_task_create(mmi_watch_alipay_init_task, 1000 * 5, LV_TASK_PRIO_MID, NULL); } #endif lv_obj_t * upay_create(lv_obj_t * activity_obj) { #ifdef __MMI_ZHSX_SUPPORT_ALIPAY__ - - if(0 == s_id2_init_result) - { - upay_rc_t bind_st = UPAY_RC_FALSE; - - bind_st = upay_check_bind_status(); - ALIPAY_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: bind_st=%d\n", __FUNCTION__, __LINE__, bind_st); - - if((NULL != netif_get_default_nw()) && (UPAY_RC_TRUE != bind_st)) - { - mmi_watch_alipay_id2_init(); - } - } - if(activity_obj == NULL) { lv_watch_activity_ext_t activity_ext; memset(&activity_ext, 0, sizeof(lv_watch_activity_ext_t)); @@ -709,16 +731,11 @@ static void upay_init_task(lv_task_t * task) printf("upay_init_task, will check upay_check_bind_status, and task->user_data is %p\n", task->user_data); bind_st = upay_check_bind_status(); - printf("upay_init_task, upay_check_bind_status is %d\n", bind_st); - - if( (netif_get_default_nw() == NULL) && (bind_st != UPAY_RC_TRUE) - #ifdef __MMI_ZHSX_SUPPORT_ALIPAY__ - || (0 == s_id2_init_result) - #endif - ) + //printf("upay_init_task, upay_check_bind_status is %d\n", bind_st); + ALIPAY_DEBUG_PRINTF("[%s][%d]: bind_st=%d\n", __FUNCTION__, __LINE__, bind_st); + if( (netif_get_default_nw() == NULL) && (bind_st != UPAY_RC_TRUE)) { //printf("[%s %d] network error\n\r",__func__,__LINE__); - ALIPAY_DEBUG_PRINTF("[%s][%d]: \n", __FUNCTION__, __LINE__); if ((lv_obj_t *)task->user_data == NULL) { @@ -1284,7 +1301,7 @@ lv_obj_t * upay_show_paycode_result_create(lv_obj_t * activity_obj, char result[ lv_obj_set_style_local_radius(btn, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 30); lv_obj_set_style_local_bg_color(btn, LV_BTN_PART_MAIN, LV_STATE_PRESSED, lv_color_make(5, 141, 248)); lv_obj_set_style_local_radius(btn, LV_BTN_PART_MAIN, LV_STATE_PRESSED, 30); - lv_obj_align(btn, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, 0); + lv_obj_align(btn, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, MMI_ALIPAY_PAY_RESULT_BTN_Y); lv_obj_set_event_cb(btn, upay_show_menu_event_cb); lv_obj_t * btn_label = lv_label_create(btn, NULL); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/camera/camera.c b/2.sdk/sdk/gui/lv_watch/lv_apps/camera/camera.c index 4326686d..e597b83b 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/camera/camera.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/camera/camera.c @@ -199,7 +199,7 @@ static lv_camera_obj_ext_t * camera_get_ext(void) static void camera_create_option(lv_obj_t * obj) { -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#ifdef USE_LV_WATCH_UI_CIRCLE return; #endif diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/dialpad/dialpad.c b/2.sdk/sdk/gui/lv_watch/lv_apps/dialpad/dialpad.c index eb94b6c7..9edac5ac 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/dialpad/dialpad.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/dialpad/dialpad.c @@ -20,7 +20,7 @@ #define DIAL_PAD_Y_NUM 4 #define DIAL_PAD_NUM (DIAL_PAD_X_NUM * DIAL_PAD_Y_NUM) #define DIAL_PAD_CONT_W DIAL_PAD_TA_W -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#ifdef USE_LV_WATCH_UI_CIRCLE #define DIAL_PAD_CONT_H (LV_VER_RES - DIAL_PAD_TA_H - 25 - 25) #else #define DIAL_PAD_CONT_H (LV_VER_RES - DIAL_PAD_TA_H - 25) @@ -150,7 +150,7 @@ lv_obj_t * dialpad_create(lv_obj_t * activity_obj) lv_textarea_set_text(ext->ta, ""); lv_textarea_set_text_align(ext->ta, LV_LABEL_ALIGN_CENTER); lv_obj_set_size(ext->ta, DIAL_PAD_TA_W, DIAL_PAD_TA_H); -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#ifdef USE_LV_WATCH_UI_CIRCLE lv_obj_set_style_local_bg_opa(ext->ta, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP); lv_obj_align(ext->ta, NULL, LV_ALIGN_IN_TOP_MID, 0, 10 + 5); lv_obj_set_base_dir(ext->ta, LV_BIDI_DIR_LTR); @@ -176,7 +176,7 @@ lv_obj_t * dialpad_create(lv_obj_t * activity_obj) //circle ext->cont_circle = lv_cont_create(obj, NULL); -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#ifdef USE_LV_WATCH_UI_CIRCLE lv_obj_set_size(ext->cont_circle, 50, 50 - 10); #else lv_obj_set_size(ext->cont_circle, 50, 50); @@ -314,7 +314,7 @@ static lv_res_t dialpad_btn_press_action(lv_obj_t * btn) if((9 != free_num) && (11 != free_num)) { //not back or dial button //show circle lv_obj_set_hidden(ext->cont_circle, false); - #ifdef USE_LV_WATCH_UI_240_240_CIRCLE + #ifdef USE_LV_WATCH_UI_CIRCLE lv_obj_set_pos(ext->cont_circle, lv_obj_get_x(btn) + 19, lv_obj_get_y(btn) + 48 + 5); #else lv_obj_set_pos(ext->cont_circle, lv_obj_get_x(btn) + 19, lv_obj_get_y(btn) + 48); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_reset.c b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_reset.c index c894ac35..71470b83 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_reset.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_reset.c @@ -81,7 +81,7 @@ lv_obj_t * factorymode_reset_create(lv_obj_t * activity_obj) lv_obj_t * btn_yes = lv_imgbtn_create(obj, NULL); lv_imgbtn_set_src(btn_yes, LV_BTN_STATE_RELEASED, ICON_OK); lv_imgbtn_set_src(btn_yes, LV_BTN_STATE_PRESSED, ICON_OK); -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#ifdef USE_LV_WATCH_UI_CIRCLE lv_obj_align(btn_yes, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 20+20, -20); #else lv_obj_align(btn_yes, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 20, -20); @@ -92,7 +92,7 @@ lv_obj_t * factorymode_reset_create(lv_obj_t * activity_obj) lv_obj_t * btn_no = lv_imgbtn_create(obj, NULL); lv_imgbtn_set_src(btn_no, LV_BTN_STATE_RELEASED, ICON_CANCEL); lv_imgbtn_set_src(btn_no, LV_BTN_STATE_PRESSED, ICON_CANCEL); -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#ifdef USE_LV_WATCH_UI_CIRCLE lv_obj_align(btn_no, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -20-20, -20); #else lv_obj_align(btn_no, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -20, -20); @@ -277,7 +277,7 @@ void mmi_watch_reset(lv_obj_t * activity_obj) { lv_watch_activity_ext_t activity_ext = {0}; - activity_ext.actId = ACT_ID_WATCH_COMMON; + activity_ext.actId = ACT_ID_WATCH_FACTORY_RESET; activity_ext.create = mmi_watch_reset; activity_ext.prepare_destory = mmi_watch_reset_prepare_destory; diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.h b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.h index 874d910a..ef519920 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.h +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_heart_rate.h @@ -22,7 +22,21 @@ extern "C" { #define HEALTH_HEART_MEASURE_CYCLE (1000 * 1) -#if USE_LV_WATCH_UI_240_320 +#ifdef USE_LV_WATCH_UI_CIRCLE + +#if USE_LV_WATCH_UI_240_240 +#define HEART_MEASURE_IMAGE_Y (25) +#define HEART_LABEL_INFO_X (0) +#define HEART_LABEL_INFO_Y (135) +#define HEART_LABEL_INFO_W (LV_HOR_RES - HEART_LABEL_INFO_X) +#define HEART_LABEL_INFO_H (30) + +#define HEART_LABEL_VALUE_X (0) +#define HEART_LABEL_VALUE_Y (165) +#define HEART_LABEL_VALUE_W (LV_HOR_RES - HEART_LABEL_VALUE_X) +#define HEART_LABEL_VALUE_H (50) + +#else #define HEART_MEASURE_IMAGE_Y (40) #define HEART_LABEL_INFO_X (0) #define HEART_LABEL_INFO_Y (180) @@ -34,27 +48,31 @@ extern "C" { #define HEART_LABEL_VALUE_W (LV_HOR_RES - HEART_LABEL_VALUE_X) #define HEART_LABEL_VALUE_H (50) -#elif USE_LV_WATCH_UI_240_280 +#endif + +#else + +#if USE_LV_WATCH_UI_240_320 #define HEART_MEASURE_IMAGE_Y (40) #define HEART_LABEL_INFO_X (0) -#define HEART_LABEL_INFO_Y (155) +#define HEART_LABEL_INFO_Y (180) #define HEART_LABEL_INFO_W (LV_HOR_RES - HEART_LABEL_INFO_X) #define HEART_LABEL_INFO_H (30) #define HEART_LABEL_VALUE_X (0) -#define HEART_LABEL_VALUE_Y (195) +#define HEART_LABEL_VALUE_Y (220) #define HEART_LABEL_VALUE_W (LV_HOR_RES - HEART_LABEL_VALUE_X) #define HEART_LABEL_VALUE_H (50) -#elif USE_LV_WATCH_UI_240_240_CIRCLE -#define HEART_MEASURE_IMAGE_Y (25) +#elif USE_LV_WATCH_UI_240_280 +#define HEART_MEASURE_IMAGE_Y (40) #define HEART_LABEL_INFO_X (0) -#define HEART_LABEL_INFO_Y (135) +#define HEART_LABEL_INFO_Y (155) #define HEART_LABEL_INFO_W (LV_HOR_RES - HEART_LABEL_INFO_X) #define HEART_LABEL_INFO_H (30) #define HEART_LABEL_VALUE_X (0) -#define HEART_LABEL_VALUE_Y (165) +#define HEART_LABEL_VALUE_Y (195) #define HEART_LABEL_VALUE_W (LV_HOR_RES - HEART_LABEL_VALUE_X) #define HEART_LABEL_VALUE_H (50) @@ -72,6 +90,8 @@ extern "C" { #endif +#endif + typedef enum { diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.c b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.c index 33850d52..b38438b9 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.c @@ -253,7 +253,7 @@ lv_obj_t * health_spo2_create(lv_obj_t * activity_obj) lv_obj_t * gif_cont = lv_cont_create(cont, NULL); lv_obj_set_size(gif_cont, LV_HOR_RES, 120); // 100); lv_obj_set_style_local_bg_color(gif_cont, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK); - #if USE_LV_WATCH_UI_240_240_CIRCLE + #if USE_LV_WATCH_UI_CIRCLE lv_obj_align(gif_cont, cont, LV_ALIGN_IN_TOP_MID, 0, 5); #else lv_obj_align(gif_cont, cont, LV_ALIGN_IN_TOP_MID, 0, 20); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.h b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.h index 19958b99..61e85526 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.h +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_spo2.h @@ -22,7 +22,21 @@ extern "C" { #define HEALTH_SPO2_MEASURE_CYCLE (1000 * 1) -#if USE_LV_WATCH_UI_240_320 +#ifdef USE_LV_WATCH_UI_CIRCLE + +#if USE_LV_WATCH_UI_240_240 +#define SPO2_MEASURE_IMAGE_Y (25) +#define SPO2_LABEL_INFO_X (0) +#define SPO2_LABEL_INFO_Y (135) +#define SPO2_LABEL_INFO_W (LV_HOR_RES - SPO2_LABEL_INFO_X) +#define SPO2_LABEL_INFO_H (30) + +#define SPO2_LABEL_VALUE_X (0) +#define SPO2_LABEL_VALUE_Y (165) +#define SPO2_LABEL_VALUE_W (LV_HOR_RES - SPO2_LABEL_VALUE_X) +#define SPO2_LABEL_VALUE_H (50) + +#else #define SPO2_MEASURE_IMAGE_Y (40) #define SPO2_LABEL_INFO_X (0) #define SPO2_LABEL_INFO_Y (180) @@ -34,27 +48,31 @@ extern "C" { #define SPO2_LABEL_VALUE_W (LV_HOR_RES - SPO2_LABEL_VALUE_X) #define SPO2_LABEL_VALUE_H (50) -#elif USE_LV_WATCH_UI_240_280 +#endif + +#else + +#if USE_LV_WATCH_UI_240_320 #define SPO2_MEASURE_IMAGE_Y (40) #define SPO2_LABEL_INFO_X (0) -#define SPO2_LABEL_INFO_Y (155) +#define SPO2_LABEL_INFO_Y (180) #define SPO2_LABEL_INFO_W (LV_HOR_RES - SPO2_LABEL_INFO_X) #define SPO2_LABEL_INFO_H (30) #define SPO2_LABEL_VALUE_X (0) -#define SPO2_LABEL_VALUE_Y (195) +#define SPO2_LABEL_VALUE_Y (220) #define SPO2_LABEL_VALUE_W (LV_HOR_RES - SPO2_LABEL_VALUE_X) #define SPO2_LABEL_VALUE_H (50) -#elif USE_LV_WATCH_UI_240_240_CIRCLE -#define SPO2_MEASURE_IMAGE_Y (25) +#elif USE_LV_WATCH_UI_240_280 +#define SPO2_MEASURE_IMAGE_Y (40) #define SPO2_LABEL_INFO_X (0) -#define SPO2_LABEL_INFO_Y (135) +#define SPO2_LABEL_INFO_Y (155) #define SPO2_LABEL_INFO_W (LV_HOR_RES - SPO2_LABEL_INFO_X) #define SPO2_LABEL_INFO_H (30) #define SPO2_LABEL_VALUE_X (0) -#define SPO2_LABEL_VALUE_Y (165) +#define SPO2_LABEL_VALUE_Y (195) #define SPO2_LABEL_VALUE_W (LV_HOR_RES - SPO2_LABEL_VALUE_X) #define SPO2_LABEL_VALUE_H (50) @@ -72,6 +90,8 @@ extern "C" { #endif +#endif + typedef enum { diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.h b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.h index 8d0ad741..dcd60d4f 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.h +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/health_measure/health_temperature.h @@ -22,8 +22,21 @@ extern "C" { #define TEMPERATURE_MEASURE_CYCLE (1000 * 1) -#if 1 -#if USE_LV_WATCH_UI_240_320 +#ifdef USE_LV_WATCH_UI_CIRCLE + +#if USE_LV_WATCH_UI_240_240 +#define TEMPERATURE_MEASURE_IMAGE_Y (25) +#define TEMPERATURE_LABEL_INFO_X (0) +#define TEMPERATURE_LABEL_INFO_Y (135) +#define TEMPERATURE_LABEL_INFO_W (LV_HOR_RES - TEMPERATURE_LABEL_INFO_X) +#define TEMPERATURE_LABEL_INFO_H (30) + +#define TEMPERATURE_LABEL_VALUE_X (0) +#define TEMPERATURE_LABEL_VALUE_Y (165) +#define TEMPERATURE_LABEL_VALUE_W (LV_HOR_RES - TEMPERATURE_LABEL_VALUE_X) +#define TEMPERATURE_LABEL_VALUE_H (50) + +#else #define TEMPERATURE_MEASURE_IMAGE_Y (40) #define TEMPERATURE_LABEL_INFO_X (0) #define TEMPERATURE_LABEL_INFO_Y (180) @@ -35,27 +48,31 @@ extern "C" { #define TEMPERATURE_LABEL_VALUE_W (LV_HOR_RES - TEMPERATURE_LABEL_VALUE_X) #define TEMPERATURE_LABEL_VALUE_H (50) -#elif USE_LV_WATCH_UI_240_280 +#endif + +#else + +#if USE_LV_WATCH_UI_240_320 #define TEMPERATURE_MEASURE_IMAGE_Y (40) #define TEMPERATURE_LABEL_INFO_X (0) -#define TEMPERATURE_LABEL_INFO_Y (155) +#define TEMPERATURE_LABEL_INFO_Y (180) #define TEMPERATURE_LABEL_INFO_W (LV_HOR_RES - TEMPERATURE_LABEL_INFO_X) #define TEMPERATURE_LABEL_INFO_H (30) #define TEMPERATURE_LABEL_VALUE_X (0) -#define TEMPERATURE_LABEL_VALUE_Y (195) +#define TEMPERATURE_LABEL_VALUE_Y (220) #define TEMPERATURE_LABEL_VALUE_W (LV_HOR_RES - TEMPERATURE_LABEL_VALUE_X) #define TEMPERATURE_LABEL_VALUE_H (50) -#elif USE_LV_WATCH_UI_240_240_CIRCLE -#define TEMPERATURE_MEASURE_IMAGE_Y (25) +#elif USE_LV_WATCH_UI_240_280 +#define TEMPERATURE_MEASURE_IMAGE_Y (40) #define TEMPERATURE_LABEL_INFO_X (0) -#define TEMPERATURE_LABEL_INFO_Y (135) +#define TEMPERATURE_LABEL_INFO_Y (155) #define TEMPERATURE_LABEL_INFO_W (LV_HOR_RES - TEMPERATURE_LABEL_INFO_X) #define TEMPERATURE_LABEL_INFO_H (30) #define TEMPERATURE_LABEL_VALUE_X (0) -#define TEMPERATURE_LABEL_VALUE_Y (165) +#define TEMPERATURE_LABEL_VALUE_Y (195) #define TEMPERATURE_LABEL_VALUE_W (LV_HOR_RES - TEMPERATURE_LABEL_VALUE_X) #define TEMPERATURE_LABEL_VALUE_H (50) @@ -73,7 +90,10 @@ extern "C" { #endif -#else +#endif + + +#if 0 #if USE_LV_WATCH_UI_240_320 #define TEMPERATURE_LABEL_BODY_INFO_X (75) #define TEMPERATURE_LABEL_BODY_INFO_Y (35) diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.h b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.h index 88341aa5..d1c054dd 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.h +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call.h @@ -62,29 +62,43 @@ extern "C" { #define MMI_VC_DIALING_TIMEOUT (60*1000) #define MMI_VC_CONNECTING_TIMEOUT (30*1000) -#if USE_LV_WATCH_UI_240_320 + +#ifdef USE_LV_WATCH_UI_CIRCLE + +#if USE_LV_WATCH_UI_240_240 +#define MMI_VC_RING_OFF_BTN_Y_OFFSET (-15) +#define MMI_VC_INCOMING_RING_OFF_BTN_X_OFFSET (20+20) +#define MMI_VC_INCOMING_HOOK_BTN_X_OFFSET (-20-20) + +#define MMI_VC_CALLING_RING_OFF_BTN_X_OFFSET (-20-20) +#define MMI_VC_CALLING_VOLUME_BTN_X_OFFSET (20+20) + +#else #define MMI_VC_RING_OFF_BTN_Y_OFFSET (-30) #define MMI_VC_INCOMING_RING_OFF_BTN_X_OFFSET (20) #define MMI_VC_INCOMING_HOOK_BTN_X_OFFSET (-20) #define MMI_VC_CALLING_RING_OFF_BTN_X_OFFSET (-20) #define MMI_VC_CALLING_VOLUME_BTN_X_OFFSET (20) +#endif -#elif USE_LV_WATCH_UI_240_280 -#define MMI_VC_RING_OFF_BTN_Y_OFFSET (-15) +#else + +#if USE_LV_WATCH_UI_240_320 +#define MMI_VC_RING_OFF_BTN_Y_OFFSET (-30) #define MMI_VC_INCOMING_RING_OFF_BTN_X_OFFSET (20) #define MMI_VC_INCOMING_HOOK_BTN_X_OFFSET (-20) #define MMI_VC_CALLING_RING_OFF_BTN_X_OFFSET (-20) #define MMI_VC_CALLING_VOLUME_BTN_X_OFFSET (20) -#elif USE_LV_WATCH_UI_240_240_CIRCLE +#elif USE_LV_WATCH_UI_240_280 #define MMI_VC_RING_OFF_BTN_Y_OFFSET (-15) -#define MMI_VC_INCOMING_RING_OFF_BTN_X_OFFSET (20+20) -#define MMI_VC_INCOMING_HOOK_BTN_X_OFFSET (-20-20) +#define MMI_VC_INCOMING_RING_OFF_BTN_X_OFFSET (20) +#define MMI_VC_INCOMING_HOOK_BTN_X_OFFSET (-20) -#define MMI_VC_CALLING_RING_OFF_BTN_X_OFFSET (-20-20) -#define MMI_VC_CALLING_VOLUME_BTN_X_OFFSET (20+20) +#define MMI_VC_CALLING_RING_OFF_BTN_X_OFFSET (-20) +#define MMI_VC_CALLING_VOLUME_BTN_X_OFFSET (20) #else #define MMI_VC_RING_OFF_BTN_Y_OFFSET (-30) @@ -93,6 +107,7 @@ extern "C" { #define MMI_VC_CALLING_RING_OFF_BTN_X_OFFSET (-20) #define MMI_VC_CALLING_VOLUME_BTN_X_OFFSET (20) +#endif #endif diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_fzd.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_fzd.c index 10a881c9..781da5f3 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_fzd.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_fzd.c @@ -1748,7 +1748,7 @@ static lv_obj_t * mmi_vc_dial_btn_screen_create(lv_obj_t * activity_obj) 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 +#ifdef USE_LV_WATCH_UI_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); @@ -1758,7 +1758,7 @@ static lv_obj_t * mmi_vc_dial_btn_screen_create(lv_obj_t * activity_obj) 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 +#ifdef USE_LV_WATCH_UI_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); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_tongxin.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_tongxin.c index e7a29d8d..5a20b5e7 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_tongxin.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_tongxin.c @@ -1771,7 +1771,7 @@ static lv_obj_t * mmi_vc_dial_btn_screen_create(lv_obj_t * activity_obj) 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 +#ifdef USE_LV_WATCH_UI_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); @@ -1781,7 +1781,7 @@ static lv_obj_t * mmi_vc_dial_btn_screen_create(lv_obj_t * activity_obj) 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 +#ifdef USE_LV_WATCH_UI_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); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_wulian.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_wulian.c index 2b0ebb9e..f384fe40 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_wulian.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_video_call/mmi_video_call_wulian.c @@ -1719,7 +1719,7 @@ static lv_obj_t * mmi_vc_dial_btn_screen_create(lv_obj_t * activity_obj) 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 +#ifdef USE_LV_WATCH_UI_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); @@ -1729,7 +1729,7 @@ static lv_obj_t * mmi_vc_dial_btn_screen_create(lv_obj_t * activity_obj) 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 +#ifdef USE_LV_WATCH_UI_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); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_ui.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_ui.c index 1a0b44d4..84efafce 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_ui.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_ui.c @@ -6,7 +6,7 @@ #ifdef __MMI_WECHAT_SUPPORT__ -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#ifdef USE_LV_WATCH_UI_CIRCLE #include "wechat_circle.c" #else diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/pedometer/bodyinfo.c b/2.sdk/sdk/gui/lv_watch/lv_apps/pedometer/bodyinfo.c index b457f366..db95b056 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/pedometer/bodyinfo.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/pedometer/bodyinfo.c @@ -65,7 +65,7 @@ lv_obj_t * bodyinfo_create(lv_obj_t * tileview, uint16_t id) lv_obj_t * content = lv_cont_create(tab, NULL); lv_obj_add_style(content, LV_CONT_PART_MAIN, &lv_watch_style_transp); -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#ifdef USE_LV_WATCH_UI_CIRCLE lv_obj_set_size(content, lv_obj_get_width(tab) - BODYINFO_LAYOUT_PADDING_HOR * 2, lv_obj_get_height(tab) -20);//* 5 / 6); #else lv_obj_set_size(content, lv_obj_get_width(tab) - BODYINFO_LAYOUT_PADDING_HOR * 2, lv_obj_get_height(tab) * 5 / 6); @@ -309,7 +309,7 @@ static lv_obj_t * roller_create(lv_obj_t * par, uint8_t type, uint16_t sel_value lv_obj_t * roller = lv_roller_create(cont, NULL); ext->info_roller = roller; -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#ifdef USE_LV_WATCH_UI_CIRCLE lv_obj_set_style_local_bg_opa(roller, LV_ROLLER_PART_BG, LV_STATE_DEFAULT, LV_OPA_TRANSP); lv_obj_set_style_local_text_line_space(roller, LV_ROLLER_PART_BG, LV_STATE_DEFAULT, 10);//20); lv_obj_set_style_local_text_color(roller, LV_ROLLER_PART_BG, LV_STATE_DEFAULT, LV_COLOR_GRAY); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone.c b/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone.c index 2e423942..cec079ea 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/phone/phone.c @@ -60,11 +60,56 @@ extern phone_call_params_t call_params; ***********************/ #ifdef __MMI_ZHSX_SUPPORT__ -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#define MMI_AUTO_ANSWER_TIMEOUT (1000 * 5) // ms +static TIMER_ID s_auto_answer_timer_id = NULL; + +void mmi_incoming_call_auto_answer_timer_stop(void) +{ + if(NULL != s_auto_answer_timer_id) + { + Hal_Timer_Stop(s_auto_answer_timer_id); + s_auto_answer_timer_id = NULL; + } +} + +void mmi_incoming_call_auto_answer_timer_cb(void * para) +{ + mmi_incoming_call_auto_answer_timer_stop(); + + lv_phone_obj_ext_t * ext = phone_get_ext(); + if((NULL == ext) || (PHONE_UI_RING != ext->phone_ui_id)) + return ; + + ring_hook_action(NULL, LV_EVENT_CLICKED); +} + +void mmi_incoming_call_auto_answer_timer_start(void) +{ + mmi_incoming_call_auto_answer_timer_stop(); + s_auto_answer_timer_id = Hal_Timer_Start(MMI_AUTO_ANSWER_TIMEOUT, mmi_incoming_call_auto_answer_timer_cb, NULL, false); +} + +void mmi_incoming_call_auto_answer_action(void) +{ + if(2 == mmi_white_list_switch_get()) // auto answer + { + mmi_incoming_call_auto_answer_timer_start(); + } +} + +#ifdef USE_LV_WATCH_UI_CIRCLE + +#ifdef USE_LV_WATCH_UI_240_240 + +#define MMI_PHONE_CALL_BTN_Y_OFFSET (-30) +#define MMI_PHONE_CALL_LEFT_BTN_X_OFFSET (30) +#define MMI_PHONE_CALL_RIGHT_BTN_X_OFFSET (-30) +#else #define MMI_PHONE_CALL_BTN_Y_OFFSET (-30) #define MMI_PHONE_CALL_LEFT_BTN_X_OFFSET (30) #define MMI_PHONE_CALL_RIGHT_BTN_X_OFFSET (-30) +#endif static void phone_dialing(lv_obj_t * content) { @@ -326,6 +371,8 @@ lv_obj_t * phone_create(lv_obj_t * activity_obj, phone_ui_t phone_ui_id) { phone_ring(content); //ring_animation(ext->phone_status_label); + + mmi_incoming_call_auto_answer_action(); } else if(ext->phone_ui_id == PHONE_UI_CONNECTED) { @@ -610,6 +657,8 @@ lv_obj_t * phone_create(lv_obj_t * activity_obj, phone_ui_t phone_ui_id) } else if(ext->phone_ui_id == PHONE_UI_RING) { phone_ring(content); ring_animation(ext->phone_status_label); + + mmi_incoming_call_auto_answer_action(); } else if(ext->phone_ui_id == PHONE_UI_CONNECTED) { phone_connected(content); connected_animation(ext->phone_status_label); @@ -1480,6 +1529,10 @@ static void phone_prepare_destory(lv_obj_t * activity_obj) Hal_Mem_Set(&call_params, 0, sizeof(phone_call_params_t)); call_params.state = MMI_MODEM_CALL_STATE_NULL; + +#ifdef __MMI_ZHSX_SUPPORT__ + mmi_incoming_call_auto_answer_timer_stop(); +#endif } static void get_time_elaps(uint32_t last_time, char * str, int8_t size) diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/qrcode/qrcode.c b/2.sdk/sdk/gui/lv_watch/lv_apps/qrcode/qrcode.c index 5bbc3d6c..1808906d 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/qrcode/qrcode.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/qrcode/qrcode.c @@ -16,7 +16,7 @@ * DEFINES *********************/ #ifdef __MMI_ZHSX_SUPPORT__ -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#ifdef USE_LV_WATCH_UI_CIRCLE #define QRCODE_BG_WIDTH (126+12) #define QRCODE_WIDTH (126) #else @@ -120,7 +120,7 @@ static lv_obj_t * qrcode_create_content(lv_obj_t * par) lv_obj_align(qrcode, content, LV_ALIGN_CENTER, 0, 0); lv_obj_t * label = lv_label_create(par, NULL); - #if USE_LV_WATCH_UI_240_240_CIRCLE + #if USE_LV_WATCH_UI_CIRCLE lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font20); #else lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/restart_and_reset/restart_and_reset.c b/2.sdk/sdk/gui/lv_watch/lv_apps/restart_and_reset/restart_and_reset.c index 0815e20e..e72055ef 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/restart_and_reset/restart_and_reset.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/restart_and_reset/restart_and_reset.c @@ -174,7 +174,7 @@ lv_obj_t * restart_create(lv_obj_t * activity_obj) btn_yes = lv_imgbtn_create(obj, NULL); lv_imgbtn_set_src(btn_yes, LV_BTN_STATE_RELEASED, ICON_OK); lv_imgbtn_set_src(btn_yes, LV_BTN_STATE_PRESSED, ICON_OK); -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#ifdef USE_LV_WATCH_UI_CIRCLE lv_obj_align(btn_yes, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 20+20, -20); #else lv_obj_align(btn_yes, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 20, -20); @@ -185,7 +185,7 @@ lv_obj_t * restart_create(lv_obj_t * activity_obj) btn_no = lv_imgbtn_create(obj, NULL); lv_imgbtn_set_src(btn_no, LV_BTN_STATE_RELEASED, ICON_CANCEL); lv_imgbtn_set_src(btn_no, LV_BTN_STATE_PRESSED, ICON_CANCEL); -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#ifdef USE_LV_WATCH_UI_CIRCLE lv_obj_align(btn_no, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -20-20, -20); #else lv_obj_align(btn_no, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -20, -20); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_about.c b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_about.c index 3ea429c3..c5ff0032 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_about.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_about.c @@ -103,7 +103,7 @@ static lv_obj_t * setting_about_create(lv_obj_t * activity_obj) snprintf(info_str, 96, "%s:%s\n%s:%s", (char *)lv_lang_get_text(WATCH_TEXT_ID_MODE), app_adaptor_get_model_id(), (char *)lv_lang_get_text(WATCH_TEXT_ID_VERSION_NUM), app_adaptor_get_version()); lv_label_set_text(info_label, info_str); - #ifdef USE_LV_WATCH_UI_240_240_CIRCLE + #ifdef USE_LV_WATCH_UI_CIRCLE lv_obj_align(info_label, content, LV_ALIGN_IN_TOP_MID, 0, 50); #else lv_obj_align(info_label, content, LV_ALIGN_IN_TOP_MID, 0, 80); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_main_menu_switch.c b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_main_menu_switch.c index 022d86b8..422089d9 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_main_menu_switch.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_main_menu_switch.c @@ -9,7 +9,7 @@ void * setting_main_menu_switch_ext_get(void) { - lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_SETTING_MAIN_MENU_SWITCH); + lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_WATCH_SETTING_COMMON); if(NULL == activity_obj) return NULL; @@ -69,7 +69,7 @@ static lv_obj_t * setting_main_menu_switch_create(lv_obj_t * activity_obj) if(NULL == activity_obj) { lv_watch_activity_ext_t activity_ext; memset(&activity_ext, 0, sizeof(lv_watch_activity_ext_t)); - activity_ext.actId = ACT_ID_SETTING_MAIN_MENU_SWITCH; + activity_ext.actId = ACT_ID_WATCH_SETTING_COMMON; activity_ext.create = setting_main_menu_switch_create; activity_ext.prepare_destory = setting_main_menu_switch_prepare_destory; activity_obj = lv_watch_creat_activity_obj(&activity_ext); @@ -156,7 +156,7 @@ void setting_main_menu_switch_create_event_cb(lv_obj_t * btn, lv_event_t event) void * setting_main_menu_switch_ext_get(void) { - lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_SETTING_MAIN_MENU_SWITCH); + lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_WATCH_SETTING_COMMON); if(NULL == activity_obj) return NULL; @@ -220,7 +220,7 @@ static lv_obj_t * setting_main_menu_switch_create(lv_obj_t * activity_obj) if(NULL == activity_obj) { lv_watch_activity_ext_t activity_ext; memset(&activity_ext, 0, sizeof(lv_watch_activity_ext_t)); - activity_ext.actId = ACT_ID_SETTING_MAIN_MENU_SWITCH; + activity_ext.actId = ACT_ID_WATCH_SETTING_COMMON; activity_ext.create = setting_main_menu_switch_create; activity_ext.prepare_destory = setting_main_menu_switch_prepare_destory; activity_obj = lv_watch_creat_activity_obj(&activity_ext); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/shutdown/shutdown.c b/2.sdk/sdk/gui/lv_watch/lv_apps/shutdown/shutdown.c index 89faf3a1..9740b2a3 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/shutdown/shutdown.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/shutdown/shutdown.c @@ -78,7 +78,7 @@ lv_obj_t * shutdown_create(lv_obj_t * activity_obj, bool confirm) lv_imgbtn_set_src(btn, LV_BTN_STATE_PRESSED, ICON_CONFIRM_BIG); lv_obj_set_event_cb(btn, shutdown_confirm_btn_action); lv_watch_obj_add_element(btn); - #ifdef USE_LV_WATCH_UI_240_240_CIRCLE + #ifdef USE_LV_WATCH_UI_CIRCLE lv_obj_align(btn, obj, LV_ALIGN_IN_BOTTOM_LEFT, 20+20, -20); #else lv_obj_align(btn, obj, LV_ALIGN_IN_BOTTOM_LEFT, 20, -20); @@ -89,7 +89,7 @@ lv_obj_t * shutdown_create(lv_obj_t * activity_obj, bool confirm) lv_imgbtn_set_src(btn, LV_BTN_STATE_PRESSED, ICON_CANCEL_BIG); lv_obj_set_event_cb(btn, shutdown_cancel_btn_action); lv_watch_obj_add_element(btn); - #ifdef USE_LV_WATCH_UI_240_240_CIRCLE + #ifdef USE_LV_WATCH_UI_CIRCLE lv_obj_align(btn, obj, LV_ALIGN_IN_BOTTOM_RIGHT, -20-20, -20); #else lv_obj_align(btn, obj, LV_ALIGN_IN_BOTTOM_RIGHT, -20, -20); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c b/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c index 3b060e27..fd96ab6f 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c @@ -362,7 +362,14 @@ void sms_msg_app_new_sms_info_ind(app_adp_new_sms_info_ind_t *sms_info) if(false == mmi_watch_is_in_do_not_disturb_time()) #endif { - Hal_NFFS_File_Play_Onetime(AUDIO_SETTING_AUDIO_MSG, query_current_volume(), NULL, 0); + if(true + #ifdef __MMI_NEW_SMS_SILENT_SUPPORT__ + && (0 != mmi_new_sms_silent_swtich_get()) + #endif + ) + { + Hal_NFFS_File_Play_Onetime(AUDIO_SETTING_AUDIO_MSG, query_current_volume(), NULL, 0); + } Hal_Vibrator_Play_Onetime(NULL, 1000); if(0 == Hal_Pm_Get_State()) { @@ -771,7 +778,7 @@ static void mbox_sms_label(lv_sms_item_ext_t * ext) lv_obj_t * msg_ta = lv_textarea_create(mbox_count, NULL); LV_ASSERT_MEM(msg_ta); - #ifdef USE_LV_WATCH_UI_240_240_CIRCLE + #ifdef USE_LV_WATCH_UI_CIRCLE lv_obj_set_size(msg_ta, LV_HOR_RES - 20 * 2, LV_VER_RES - 20 - 15 * 2 - 40); #else lv_obj_set_size(msg_ta, LV_HOR_RES - 15 * 2, LV_VER_RES - 20 - 15 * 2 - 40); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/status_and_setting/status_and_setting.c b/2.sdk/sdk/gui/lv_watch/lv_apps/status_and_setting/status_and_setting.c index 40f0d35d..e1fb1e1a 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/status_and_setting/status_and_setting.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/status_and_setting/status_and_setting.c @@ -50,7 +50,7 @@ lv_obj_t * status_and_setting_create(lv_obj_t * tileview, uint16_t id) if(tab == NULL) return NULL; lv_obj_t * status_content = status_content_create(tab); -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#ifdef USE_LV_WATCH_UI_CIRCLE lv_obj_align(status_content, tab, LV_ALIGN_IN_TOP_MID, 0, 20 + 5); #else lv_obj_align(status_content, tab, LV_ALIGN_IN_TOP_MID, 0, 20); @@ -173,7 +173,11 @@ static void status_update(lv_anim_t * anim) lv_obj_t * label = lv_label_create(status_ext->network_status_cont, NULL); lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20); if(MMI_MODEM_PLMN_RAT_LTE == rat) { + #ifdef MMI_PROJECT_Z5_DS_Z12_COMMON + lv_label_set_text(label, "5G"); + #else lv_label_set_text(label, "4G"); + #endif lv_img_set_src(status_ext->phone_signal_img, phone_signal_img[watch_modem_get_signal_bar_req()]); if(!is_wifi_connected) { /* IMS register state */ @@ -309,7 +313,7 @@ static void status_update(lv_anim_t * anim) static lv_obj_t * status_content_create(lv_obj_t * par) { if(!par) par = lv_scr_act(); -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#ifdef USE_LV_WATCH_UI_CIRCLE lv_coord_t width = LV_HOR_RES - 50 - 10; #else lv_coord_t width = LV_HOR_RES - 50; @@ -426,7 +430,7 @@ static void brightness_btn_action(lv_obj_t * obj, lv_event_t event) { if(LV_EVENT_CLICKED == event) { - #ifdef USE_LV_WATCH_UI_240_240_CIRCLE + #ifdef USE_LV_WATCH_UI_CIRCLE slider_create(NULL, SETTING_BRIGHTNESS, 100, brightness_slider_action); #else slider_create(NULL, SETTING_BRIGHTNESS, 130, brightness_slider_action); @@ -438,7 +442,7 @@ static void volume_btn_action(lv_obj_t * obj, lv_event_t event) { if(LV_EVENT_CLICKED == event) { - #ifdef USE_LV_WATCH_UI_240_240_CIRCLE + #ifdef USE_LV_WATCH_UI_CIRCLE slider_create(NULL, SETTING_VOLUME, 100, volume_slider_action); #else slider_create(NULL, SETTING_VOLUME, 130, volume_slider_action); diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/timer/timer_clock.c b/2.sdk/sdk/gui/lv_watch/lv_apps/timer/timer_clock.c index 14fe4afa..fbdd3632 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/timer/timer_clock.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/timer/timer_clock.c @@ -162,7 +162,7 @@ lv_obj_t * timer_list_create(lv_obj_t * activity_obj) lv_page_set_scrollbar_mode(page, LV_SCROLLBAR_MODE_OFF); lv_obj_t * cont = lv_cont_create(page, NULL); -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#ifdef USE_LV_WATCH_UI_CIRCLE uint8_t item_row = TIMER_ITEM_NUM; uint8_t item_h = 100; uint8_t item_w = item_h; diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/weather/weather.c b/2.sdk/sdk/gui/lv_watch/lv_apps/weather/weather.c index 277351ad..3cb33e84 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/weather/weather.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/weather/weather.c @@ -139,7 +139,7 @@ void weather_update(lv_obj_t * cont) else { weather_ext->content1 = weather_content_info_create(cont, &weather_info); - #ifdef USE_LV_WATCH_UI_240_240_CIRCLE + #ifdef USE_LV_WATCH_UI_CIRCLE lv_obj_align(weather_ext->content1, cont, LV_ALIGN_IN_TOP_MID, 0, 5); #else lv_obj_align(weather_ext->content1, cont, LV_ALIGN_IN_TOP_MID, 0, 30); @@ -273,7 +273,7 @@ void weather_update(lv_obj_t * cont) weather_ext->content1 = weather_image_content_create(cont, &weather_info); weather_ext->content2 = weather_temperature_content_create(cont, &weather_info); weather_ext->content3 = weather_city_content_create(cont, &weather_info); - #ifdef USE_LV_WATCH_UI_240_240_CIRCLE + #ifdef USE_LV_WATCH_UI_CIRCLE lv_obj_align(weather_ext->content1, cont, LV_ALIGN_IN_TOP_MID, 0, 0); lv_obj_align(weather_ext->content2, weather_ext->content1, LV_ALIGN_OUT_BOTTOM_MID, 0, 1); lv_obj_align(weather_ext->content3, weather_ext->content2, LV_ALIGN_OUT_BOTTOM_MID, 0, 1); diff --git a/2.sdk/sdk/gui/lv_watch/lv_objx/lv_watch_list/lv_watch_list.c b/2.sdk/sdk/gui/lv_watch/lv_objx/lv_watch_list/lv_watch_list.c index d36eb99f..a951f6ba 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_objx/lv_watch_list/lv_watch_list.c +++ b/2.sdk/sdk/gui/lv_watch/lv_objx/lv_watch_list/lv_watch_list.c @@ -114,7 +114,7 @@ lv_obj_t * lv_watch_list_create(lv_obj_t * activity_obj) #ifdef __MMI_ZHSX_SUPPORT__ lv_list_set_scrollbar_mode(list, LV_SCROLLBAR_MODE_OFF); -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#ifdef USE_LV_WATCH_UI_CIRCLE lv_obj_set_size(list, lv_obj_get_width(content), lv_obj_get_height(content) - lv_obj_get_height(label_cont) - 35); #else lv_obj_set_size(list, lv_obj_get_width(content), lv_obj_get_height(content) - lv_obj_get_height(label_cont)); @@ -170,7 +170,7 @@ lv_obj_t * lv_watch_list_add(lv_obj_t * obj, const void * img_src, watchLangTxtI lv_obj_set_event_cb(btn, rel_event_cb); lv_watch_obj_add_element(btn); -#ifdef USE_LV_WATCH_UI_240_240_CIRCLE +#ifdef USE_LV_WATCH_UI_CIRCLE lv_obj_set_style_local_pad_top(btn, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 6); lv_obj_set_style_local_pad_bottom(btn, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 6); lv_obj_set_style_local_pad_left(btn, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 15+10); diff --git a/2.sdk/sdk/gui/lv_watch/lv_watch.c b/2.sdk/sdk/gui/lv_watch/lv_watch.c index 1b27b6e1..21562ae6 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_watch.c +++ b/2.sdk/sdk/gui/lv_watch/lv_watch.c @@ -129,6 +129,9 @@ static void mmi_data_init_after_watch_create(void) #ifdef __MMI_CUSTOM_HENG_AI__ mmi_hengai_sleep_activation_nv_read(); #endif +#ifdef __MMI_SEDENTARY_REMIND_SUPPORT__ + mmi_sedentary_remind_mission_power_on_check(); +#endif diff --git a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c index f94948d8..2ee96a9f 100644 --- a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c +++ b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c @@ -2763,6 +2763,7 @@ bool mmi_protocol_fzd_parse_SERVER_SET_DIAL_PAD_SWITCH(unsigned char * next_buff return result; } +// 0-off; 1-on; 2-auto answer bool mmi_protocol_fzd_parse_SERVER_SET_WHITE_LIST_SWITCH(unsigned char * next_buff, unsigned int next_buff_len) { bool result = false; diff --git a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c index cf207221..55ad963c 100644 --- a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c +++ b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c @@ -38,6 +38,11 @@ bool mmi_active_screen_is_prohibit_interrupted(void) return true; } + if(NULL != lv_watch_get_activity_obj(ACT_ID_WATCH_FACTORY_RESET)) + { + return true; + } + if(NULL != lv_watch_get_activity_obj(ACT_ID_ALARM)) { return true; @@ -772,7 +777,7 @@ static void mmi_watch_do_not_disturb_screen_display(lv_obj_t * cont) lv_label_set_text(label_time, t_time_str); lv_obj_add_style(label_time, LV_LABEL_PART_MAIN, &lv_watch_font40); lv_label_set_align(label_time, LV_LABEL_ALIGN_CENTER); - #ifdef USE_LV_WATCH_UI_240_240_CIRCLE + #ifdef USE_LV_WATCH_UI_CIRCLE lv_obj_align(label_time, NULL, LV_ALIGN_IN_TOP_MID, 0, 30); #else lv_obj_align(label_time, NULL, LV_ALIGN_IN_TOP_MID, 0, 50); @@ -782,7 +787,7 @@ static void mmi_watch_do_not_disturb_screen_display(lv_obj_t * cont) lv_label_set_text_id(label_prompt, WATCH_TEXT_ID_FORBIDDEN_PERIOD); lv_obj_add_style(label_prompt, LV_LABEL_PART_MAIN, &lv_watch_font26); lv_label_set_align(label_prompt, LV_LABEL_ALIGN_CENTER); - #ifdef USE_LV_WATCH_UI_240_240_CIRCLE + #ifdef USE_LV_WATCH_UI_CIRCLE lv_obj_align(label_prompt, label_time, LV_ALIGN_OUT_BOTTOM_MID, 0, 5); #else lv_obj_align(label_prompt, label_time, LV_ALIGN_OUT_BOTTOM_MID, 0, 10); @@ -806,7 +811,7 @@ static void mmi_watch_do_not_disturb_screen_display(lv_obj_t * cont) lv_label_set_text(label, t_time_str); lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26); lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); - #ifdef USE_LV_WATCH_UI_240_240_CIRCLE + #ifdef USE_LV_WATCH_UI_CIRCLE lv_obj_align(label, label_prompt, LV_ALIGN_OUT_BOTTOM_MID, 0, 3 + (t_height + 3) * j); #else lv_obj_align(label, label_prompt, LV_ALIGN_OUT_BOTTOM_MID, 0, 5 + (t_height + 5) * j); diff --git a/2.sdk/sdk/product/craneg_modem/config/watch/lv_conf.h b/2.sdk/sdk/product/craneg_modem/config/watch/lv_conf.h index 685f779e..f25cdcdb 100644 --- a/2.sdk/sdk/product/craneg_modem/config/watch/lv_conf.h +++ b/2.sdk/sdk/product/craneg_modem/config/watch/lv_conf.h @@ -36,6 +36,9 @@ #elif USE_LV_WATCH_UI_240_280 #define LV_HOR_RES_MAX (240) #define LV_VER_RES_MAX (280) +#elif USE_LV_WATCH_UI_466_466 +#define LV_HOR_RES_MAX (466) +#define LV_VER_RES_MAX (466) #elif USE_LV_WATCH_UI_466_466_CIRCLE #define LV_HOR_RES_MAX (466) #define LV_VER_RES_MAX (466)