From: @CHENG <2393524978@qq.com> Date: Mon, 15 Jul 2024 08:54:46 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=6bdd1e0dc626cfdc7202515d144fe3c670996d34;p=mirrors%2FASR3603_Z5.git gengxin --- diff --git a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/common/ICON_WARNNING_PROMPT.png b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/common/ICON_WARNNING_PROMPT.png index c9d57533..f9fae63b 100644 Binary files a/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/common/ICON_WARNNING_PROMPT.png and b/2.sdk/project/Z5_HA_K18/gui/lv_watch/resource/png/common/ICON_WARNNING_PROMPT.png differ 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 4a683cce..2fdf3917 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 @@ -1880,8 +1880,8 @@ static lv_obj_t * mmi_chip_high_temp_screen_create(lv_obj_t * activity_obj) lv_obj_t * img = lv_img_create(cont, NULL); lv_img_set_src(img, ICON_WARNNING_PROMPT); #ifdef USE_LV_WATCH_UI_CIRCLE - #ifdef USE_LV_WATCH_UI_240_240 - lv_obj_align(img, NULL, LV_ALIGN_IN_TOP_MID, 0, 15); + #ifdef USE_LV_WATCH_UI_466_466 + lv_obj_align(img, NULL, LV_ALIGN_IN_TOP_MID, 0, 50); #else lv_obj_align(img, NULL, LV_ALIGN_IN_TOP_MID, 0, 15); #endif @@ -1895,21 +1895,29 @@ static lv_obj_t * mmi_chip_high_temp_screen_create(lv_obj_t * activity_obj) // text lv_obj_t * label_prompt = lv_label_create(cont, NULL); +#ifdef USE_LV_WATCH_UI_466_466 + lv_obj_add_style(label_prompt, LV_OBJ_PART_MAIN, &lv_watch_font40); +#else lv_obj_add_style(label_prompt, LV_OBJ_PART_MAIN, &lv_watch_font26); +#endif lv_label_set_text_id(label_prompt, WATCH_TEXT_ID_CHIP_HIGH_TEMPERATURE); lv_label_set_align(label_prompt, LV_LABEL_ALIGN_CENTER); lv_obj_align(label_prompt, NULL, LV_ALIGN_CENTER, 0, 0); // button lv_obj_t * btn = lv_btn_create(cont, NULL); +#ifdef USE_LV_WATCH_UI_466_466 + lv_obj_set_size(btn, 140, 70); +#else lv_obj_set_size(btn, 100, 56); +#endif lv_obj_set_style_local_bg_color(btn, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_MAKE(0x47, 0xA6, 0xFF)); 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(0x47, 0xA6, 0xFF)); lv_obj_set_style_local_radius(btn, LV_BTN_PART_MAIN, LV_STATE_PRESSED, 30); #ifdef USE_LV_WATCH_UI_CIRCLE - #ifdef USE_LV_WATCH_UI_240_240 - lv_obj_align(btn, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, -15); + #ifdef USE_LV_WATCH_UI_466_466 + lv_obj_align(btn, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, -50); #else lv_obj_align(btn, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, -15); #endif @@ -1923,7 +1931,11 @@ static lv_obj_t * mmi_chip_high_temp_screen_create(lv_obj_t * activity_obj) lv_obj_set_event_cb(btn, mmi_chip_high_temp_btn_event_cb); lv_obj_t * label_btn = lv_label_create(btn, NULL); +#ifdef USE_LV_WATCH_UI_466_466 + lv_obj_add_style(label_btn, LV_LABEL_PART_MAIN, &lv_watch_font40); +#else lv_obj_add_style(label_btn, LV_LABEL_PART_MAIN, &lv_watch_font26); +#endif lv_label_set_text_id(label_btn, WATCH_TEXT_ID_OK); lv_label_set_align(label_btn, LV_LABEL_ALIGN_CENTER); lv_obj_align(label_btn, NULL, LV_ALIGN_CENTER, 0, 0);