gengxin

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 71470b8..fe83975 100644 (file)
--- 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
@@ -75,14 +75,24 @@ lv_obj_t * factorymode_reset_create(lv_obj_t * activity_obj)
                lv_obj_set_width(label_tip, LV_HOR_RES - 40);
        else
            lv_obj_set_width(label_tip, LV_HOR_RES * 2 / 3);
+
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_align(label_tip, obj, LV_ALIGN_IN_TOP_MID, 0, 120);
+    lv_obj_add_style(label_tip, LV_LABEL_PART_MAIN, &lv_watch_font36);
+#else
     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);
+#endif
 
        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_CIRCLE
+       #ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_align(btn_yes, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 20+50, -40);
+       #else
        lv_obj_align(btn_yes, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 20+20, -20);
+       #endif
 #else
        lv_obj_align(btn_yes, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 20, -20);
 #endif
@@ -93,7 +103,11 @@ lv_obj_t * factorymode_reset_create(lv_obj_t * activity_obj)
        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_CIRCLE
+       #ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_align(btn_no, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -20-50, -40);
+       #else
        lv_obj_align(btn_no, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -20-20, -20);
+       #endif
 #else
        lv_obj_align(btn_no, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -20, -20);
 #endif

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 1808906..08714aa 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/qrcode/qrcode.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/qrcode/qrcode.c
@@ -17,8 +17,13 @@
  *********************/
 #ifdef __MMI_ZHSX_SUPPORT__
 #ifdef USE_LV_WATCH_UI_CIRCLE
+#ifdef USE_LV_WATCH_UI_466_466
+#define QRCODE_BG_WIDTH (292) // (272)
+#define QRCODE_WIDTH (280) // (260)
+#else
 #define QRCODE_BG_WIDTH (126+12)
 #define QRCODE_WIDTH (126)
+#endif
 #else
 #define QRCODE_BG_WIDTH (190+12)
 #define QRCODE_WIDTH (188)
@@ -120,11 +125,15 @@ 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_CIRCLE
-       lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font20);
+#if USE_LV_WATCH_UI_CIRCLE
+       #ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font36);
        #else
-       lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26);
+       lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font20);
        #endif
+#else
+       lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26);
+#endif
        lv_label_set_text(label, imei);
        lv_obj_set_click(label, false);
        lv_obj_align(label, content, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);

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 e72055e..1e7eabb 100644 (file)
--- 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
@@ -67,11 +67,19 @@ lv_obj_t * restart_and_reset_create(lv_obj_t * activity_obj)
     }
 
     label = lv_label_create(obj, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26_gray);
+#else
     lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20_gray);
+#endif
     lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
     lv_obj_set_click(label, false);
     lv_label_set_text_id(label, WATCH_TEXT_ID_RESTART_AND_RESET);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_align(label, obj, LV_ALIGN_IN_TOP_MID, 0, 20);
+#else
     lv_obj_align(label, obj, LV_ALIGN_IN_TOP_MID, 0, 10);
+#endif
 
     btn_restart = lv_btn_create(obj, NULL);
     lv_obj_add_style(btn_restart, LV_BTN_PART_MAIN, &lv_style_transp_fit);
@@ -84,8 +92,11 @@ lv_obj_t * restart_and_reset_create(lv_obj_t * activity_obj)
     lv_img_set_src(img_restart, ICON_SETTING_REBOOT);
 
     label_restart = lv_label_create(btn_restart, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_add_style(label_restart, LV_LABEL_PART_MAIN, &lv_watch_font36);
+#else
     lv_obj_add_style(label_restart, LV_LABEL_PART_MAIN, &lv_watch_font26); // &lv_watch_font20);
-
+#endif
     lv_label_set_text_id(label_restart, WATCH_TEXT_ID_RESTART);
 
     btn_reset = lv_btn_create(obj, btn_restart);
@@ -96,12 +107,19 @@ lv_obj_t * restart_and_reset_create(lv_obj_t * activity_obj)
     lv_img_set_src(img_reset, ICON_SETTING_RESTORE);
 
     label_reset = lv_label_create(btn_reset, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_add_style(label_reset, LV_LABEL_PART_MAIN, &lv_watch_font36);
+#else
     lv_obj_add_style(label_reset, LV_LABEL_PART_MAIN, &lv_watch_font26); // &lv_watch_font20);
-
+#endif
     lv_label_set_text_id(label_reset, WATCH_TEXT_ID_FACTORY_RESET);
     lv_label_set_long_mode(label_reset, LV_LABEL_LONG_BREAK);
     lv_obj_set_width(label_reset, LV_HOR_RES * 2 / 3);
 
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_align(btn_restart, obj, LV_ALIGN_CENTER, -20, -60);
+       lv_obj_align(btn_reset, btn_restart, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 60);
+#else
     if(lv_obj_get_base_dir(obj) == LV_BIDI_DIR_RTL){
         lv_obj_align(btn_restart, obj, LV_ALIGN_CENTER, 20, -50); // -20);
         lv_obj_align(btn_reset, btn_restart, LV_ALIGN_OUT_BOTTOM_RIGHT, 0, 50); // 10);
@@ -109,6 +127,7 @@ lv_obj_t * restart_and_reset_create(lv_obj_t * activity_obj)
         lv_obj_align(btn_restart, obj, LV_ALIGN_CENTER, -20, -50); // -20);
         lv_obj_align(btn_reset, btn_restart, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 50); // 10);
     }
+#endif
 
     return obj;
 }
@@ -158,6 +177,12 @@ lv_obj_t * restart_create(lv_obj_t * activity_obj)
     //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);
 
+#ifdef USE_LV_WATCH_UI_466_466
+       label_tip = lv_label_create(obj, NULL);
+       lv_label_set_text_id(label_tip, WATCH_TEXT_ID_RESTART_Q);
+       lv_obj_add_style(label_tip, LV_LABEL_PART_MAIN, &lv_watch_font36);
+       lv_obj_align(label_tip, obj, LV_ALIGN_CENTER, 0, -40);
+#else
     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);
@@ -170,12 +195,17 @@ lv_obj_t * restart_create(lv_obj_t * activity_obj)
     label_tip = lv_label_create(content, NULL);
     lv_label_set_text_id(label_tip, WATCH_TEXT_ID_RESTART_Q);
     lv_obj_add_style(label_tip, LV_LABEL_PART_MAIN, &lv_watch_font26);
+#endif
 
     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_CIRCLE
+       #ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_align(btn_yes, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 70, -40);
+       #else
     lv_obj_align(btn_yes, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 20+20, -20);
+       #endif
 #else
     lv_obj_align(btn_yes, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 20, -20);
 #endif
@@ -186,7 +216,11 @@ lv_obj_t * restart_create(lv_obj_t * activity_obj)
     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_CIRCLE
+       #ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_align(btn_no, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -70, -40);
+       #else
     lv_obj_align(btn_no, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -20-20, -20);
+       #endif
 #else
     lv_obj_align(btn_no, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -20, -20);
 #endif

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 c5ff003..63a5d7d 100644 (file)
--- 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
@@ -89,25 +89,43 @@ static lv_obj_t * setting_about_create(lv_obj_t * activity_obj)
     about_ext->click_count = 0;
 
     lv_obj_t * title_label = lv_label_create(content, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_add_style(title_label, LV_LABEL_PART_MAIN, &lv_watch_font26_gray);
+#else
     lv_obj_add_style(title_label, LV_LABEL_PART_MAIN, &lv_watch_font20_gray);
+#endif
     lv_label_set_align(title_label, LV_LABEL_ALIGN_CENTER);
     lv_obj_set_click(title_label, false);
     lv_label_set_text_id(title_label, WATCH_TEXT_ID_ABOUT_WATCH);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_align(title_label, content, LV_ALIGN_IN_TOP_MID, 0, 20);
+#else
     lv_obj_align(title_label, content, LV_ALIGN_IN_TOP_MID, 0, 10);
+#endif
 
     lv_obj_t * info_label = lv_label_create(content, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_add_style(info_label, LV_LABEL_PART_MAIN, &lv_watch_font36);
+    lv_label_set_long_mode(info_label, LV_LABEL_LONG_BREAK);
+       lv_obj_set_width(info_label, LV_HOR_RES - 60);
+#else
     lv_obj_add_style(info_label, LV_LABEL_PART_MAIN, &lv_watch_font26); // &lv_watch_font20);
     lv_label_set_long_mode(info_label, LV_LABEL_LONG_BREAK);
        lv_obj_set_width(info_label, LV_HOR_RES - 20);
+#endif
     lv_label_set_align(info_label, LV_LABEL_ALIGN_CENTER);
        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_CIRCLE
-       lv_obj_align(info_label, content, LV_ALIGN_IN_TOP_MID, 0, 50);
+#ifdef USE_LV_WATCH_UI_CIRCLE
+       #ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_align(info_label, content, LV_ALIGN_IN_TOP_MID, 0, 120);
        #else
-       lv_obj_align(info_label, content, LV_ALIGN_IN_TOP_MID, 0, 80);
+       lv_obj_align(info_label, content, LV_ALIGN_IN_TOP_MID, 0, 50);
        #endif
+#else
+       lv_obj_align(info_label, content, LV_ALIGN_IN_TOP_MID, 0, 80);
+#endif
     lv_obj_set_click(info_label, false);
 
 #if 0

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_brightness.c b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_brightness.c
index 9f9e534..864d733 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_brightness.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_brightness.c
@@ -132,6 +132,15 @@ lv_obj_t * setting_brightness_create(lv_obj_t * activity_obj)
         return NULL;
     }
 
+#ifdef USE_LV_WATCH_UI_466_466
+       label = lv_label_create(obj, NULL);
+       lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26_gray);
+       lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
+       lv_obj_set_click(label, false);
+       lv_label_set_text_id(label, WATCH_TEXT_ID_BRIGHTNESS_ADJUST);
+       lv_obj_align(label, obj, LV_ALIGN_IN_TOP_MID, 0, 20);
+       lv_watch_set_free_num(label, 0);
+#else
     label = lv_label_create(obj, NULL);
     lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20_gray);
     lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
@@ -139,6 +148,7 @@ lv_obj_t * setting_brightness_create(lv_obj_t * activity_obj)
     lv_label_set_text_id(label, WATCH_TEXT_ID_BRIGHTNESS_ADJUST);
     lv_obj_align(label, obj, LV_ALIGN_IN_TOP_MID, 0, 10);
     lv_watch_set_free_num(label, 0);
+#endif
 
     bar_content = setting_brightness_bar_content_create(obj);
     lv_obj_add_style(bar_content, LV_CONT_PART_MAIN, &lv_watch_style_transp);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_volume.c b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_volume.c
index 57a6f1f..ea781ea 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_volume.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_volume.c
@@ -635,6 +635,15 @@ lv_obj_t * setting_volume_create(lv_obj_t * activity_obj)
         return NULL;
     }
 
+#ifdef USE_LV_WATCH_UI_466_466
+       label = lv_label_create(obj, NULL);
+       lv_obj_add_style(label, LV_LABEL_PART_MAIN,  &lv_watch_font26_gray);
+       lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
+       lv_obj_set_click(label, false);
+       lv_label_set_text_id(label, WATCH_TEXT_ID_VOLUME_ADJUST);
+       lv_obj_align(label, obj, LV_ALIGN_IN_TOP_MID, 0, 20);
+       lv_watch_set_free_num(label, 0);
+#else
     label = lv_label_create(obj, NULL);
     lv_obj_add_style(label, LV_LABEL_PART_MAIN,  &lv_watch_font20_gray);
     lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
@@ -642,6 +651,7 @@ lv_obj_t * setting_volume_create(lv_obj_t * activity_obj)
     lv_label_set_text_id(label, WATCH_TEXT_ID_VOLUME_ADJUST);
     lv_obj_align(label, obj, LV_ALIGN_IN_TOP_MID, 0, 10);
     lv_watch_set_free_num(label, 0);
+#endif
 
     bar_content = setting_volume_bar_content_create(obj);
     lv_obj_add_style(bar_content, LV_CONT_PART_MAIN,  &lv_watch_style_transp);

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 01e2d90..6c412d2 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/shutdown/shutdown.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/shutdown/shutdown.c
@@ -69,7 +69,11 @@ lv_obj_t * shutdown_create(lv_obj_t * activity_obj, bool confirm)
 
         //label = lv_label_create(obj, NULL);
         //lv_obj_set_width(label, lv_obj_get_width(obj) - 40);
+       #ifdef USE_LV_WATCH_UI_466_466
+               lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font36);
+       #else
         lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26);
+       #endif
         lv_label_set_text_id(label, WATCH_TEXT_ID_CONFIRM_SHUTDOWN);
         lv_obj_align(label, obj, LV_ALIGN_CENTER, 0, -40);
 
@@ -79,7 +83,11 @@ lv_obj_t * shutdown_create(lv_obj_t * activity_obj, bool confirm)
         lv_obj_set_event_cb(btn, shutdown_confirm_btn_action);
         lv_watch_obj_add_element(btn);
        #ifdef USE_LV_WATCH_UI_CIRCLE
+               #ifdef USE_LV_WATCH_UI_466_466
+               lv_obj_align(btn, obj, LV_ALIGN_IN_BOTTOM_LEFT, 70, -40);
+               #else
                lv_obj_align(btn, obj, LV_ALIGN_IN_BOTTOM_LEFT, 20+20, -20);
+               #endif
        #else
         lv_obj_align(btn, obj, LV_ALIGN_IN_BOTTOM_LEFT, 20, -20);
        #endif
@@ -90,7 +98,11 @@ lv_obj_t * shutdown_create(lv_obj_t * activity_obj, bool confirm)
         lv_obj_set_event_cb(btn, shutdown_cancel_btn_action);
         lv_watch_obj_add_element(btn);
        #ifdef USE_LV_WATCH_UI_CIRCLE
+               #ifdef USE_LV_WATCH_UI_466_466
+               lv_obj_align(btn, obj, LV_ALIGN_IN_BOTTOM_RIGHT, -70, -40);
+               #else
                lv_obj_align(btn, obj, LV_ALIGN_IN_BOTTOM_RIGHT, -20-20, -20);
+               #endif
        #else
         lv_obj_align(btn, obj, LV_ALIGN_IN_BOTTOM_RIGHT, -20, -20);
        #endif

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 91b1302..cd5b461 100644 (file)
--- 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
@@ -51,14 +51,22 @@ lv_obj_t * status_and_setting_create(lv_obj_t * tileview, uint16_t id)
 
     lv_obj_t * status_content = status_content_create(tab);
 #ifdef USE_LV_WATCH_UI_CIRCLE
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_align(status_content, tab, LV_ALIGN_IN_TOP_MID, 0, 40);
+#else
     lv_obj_align(status_content, tab, LV_ALIGN_IN_TOP_MID, 0, 20 + 5);
+#endif
 #else
     lv_obj_align(status_content, tab, LV_ALIGN_IN_TOP_MID, 0, 20);
 #endif
 
     lv_obj_t * setting_content = setting_content_create(tab);
     lv_obj_add_style(setting_content, LV_CONT_PART_MAIN, &lv_watch_style_transp);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_align(setting_content, tab, LV_ALIGN_IN_BOTTOM_MID, 0, -40);
+#else
     lv_obj_align(setting_content, tab, LV_ALIGN_IN_BOTTOM_MID, 0, -20);
+#endif
 
     lv_tileview_add_element(tileview, status_content);
     lv_tileview_add_element(tileview, setting_content);
@@ -88,7 +96,11 @@ static void status_update_anim_start(lv_obj_t * cont)
 static lv_obj_t * cont_create(lv_obj_t * par, lv_align_t cont_layout, lv_style_t * style, lv_coord_t width)
 {
     lv_obj_t * content = lv_watch_cont_create(par, cont_layout, style, width);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_set_height(content, 60);
+#else
     lv_obj_set_height(content, 30);
+#endif
     return content;
 }
 
@@ -171,7 +183,11 @@ static void status_update(lv_anim_t * anim)
 
         /* 2G/4G icon */
         lv_obj_t * label = lv_label_create(status_ext->network_status_cont, NULL);
+               #ifdef USE_LV_WATCH_UI_466_466
+        lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font30);
+               #else
         lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20);
+               #endif
         if(MMI_MODEM_PLMN_RAT_LTE == rat) {
                        #ifdef MMI_PROJECT_Z5_DS_Z12_COMMON
             lv_label_set_text(label, "5G");
@@ -184,7 +200,11 @@ static void status_update(lv_anim_t * anim)
                 uint8_t ims_reg_state = watch_modem_get_ims_reg_state_req();
                 if(1 == ims_reg_state) {
                     lv_obj_t * label_ims = lv_label_create(status_ext->network_status_cont, NULL);
+                                       #ifdef USE_LV_WATCH_UI_466_466
+                    lv_obj_add_style(label_ims, LV_LABEL_PART_MAIN, &lv_watch_font20);
+                                       #else
                     lv_obj_add_style(label_ims, LV_LABEL_PART_MAIN, &lv_watch_font10);
+                                       #endif
                     lv_obj_align(label_ims, label, LV_ALIGN_OUT_RIGHT_TOP, 5, 0);
                     lv_label_set_text(label_ims, "HD");
                     lv_obj_set_click(label_ims, false);
@@ -197,7 +217,11 @@ static void status_update(lv_anim_t * anim)
                 /* UMTS register state */
                 uint8_t umts_reg_state = watch_modem_get_umts_reg_state_req();
                 lv_obj_t * label_umts = lv_label_create(status_ext->network_status_cont, NULL);
+                               #ifdef USE_LV_WATCH_UI_466_466
+                lv_obj_add_style(label_umts, LV_LABEL_PART_MAIN, &lv_watch_font20);
+                               #else
                 lv_obj_add_style(label_umts, LV_LABEL_PART_MAIN, &lv_watch_font10);
+                               #endif
                 lv_obj_align(label_umts, label, LV_ALIGN_OUT_RIGHT_TOP, 5, 0);
                 if(0 == umts_reg_state) {
                     lv_label_set_text(label_umts, "W");
@@ -215,7 +239,11 @@ static void status_update(lv_anim_t * anim)
                 uint8_t gsm_reg_state = watch_modem_get_gsm_reg_state_req();
                 if(1 == gsm_reg_state) {
                     lv_obj_t * label_gsm = lv_label_create(status_ext->network_status_cont, NULL);
+                                       #ifdef USE_LV_WATCH_UI_466_466
+                    lv_obj_add_style(label_gsm, LV_LABEL_PART_MAIN, &lv_watch_font20);
+                                       #else
                     lv_obj_add_style(label_gsm, LV_LABEL_PART_MAIN, &lv_watch_font10);
+                                       #endif
                     lv_obj_align(label_gsm, label, LV_ALIGN_OUT_RIGHT_TOP, 5, 0);
                     lv_label_set_text(label_gsm, "E");
                     lv_obj_set_click(label_gsm, false);
@@ -257,7 +285,11 @@ static void status_update(lv_anim_t * anim)
     lv_obj_t * battery_label = lv_obj_get_child(status_ext->battery_img, NULL);
 
 #if USE_LV_WATCH_STATUS_BATT_VALUE
+       #ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_add_style(battery_label, LV_LABEL_PART_MAIN, &lv_watch_font24);
+       #else
     lv_obj_add_style(battery_label, LV_LABEL_PART_MAIN, &lv_watch_font14);
+       #endif
     snprintf(str, 20, "%d", Hal_Battery_Get_Status());
     lv_label_set_text(battery_label, str);
     lv_obj_align(battery_label, NULL, LV_ALIGN_CENTER, 0, 0);
@@ -265,7 +297,11 @@ static void status_update(lv_anim_t * anim)
 
     if(HAL_CHG_CONNECTED == Hal_Charger_Get_Status()) {
         if(Hal_Battery_Get_Status() == 100) {
+                       #ifdef USE_LV_WATCH_UI_466_466
+            lv_obj_add_style(battery_label, LV_LABEL_PART_MAIN, &lv_watch_font20);
+                       #else
             lv_obj_add_style(battery_label, LV_LABEL_PART_MAIN, &lv_watch_font10);
+                       #endif
             lv_label_set_text(battery_label, "OK");
             lv_obj_align(battery_label, NULL, LV_ALIGN_CENTER, 0, 0);
         }
@@ -314,14 +350,22 @@ static lv_obj_t * status_content_create(lv_obj_t * par)
 {
     if(!par) par = lv_scr_act();
 #ifdef USE_LV_WATCH_UI_CIRCLE
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_coord_t width = LV_HOR_RES - 150;
+#else
     lv_coord_t width = LV_HOR_RES - 50 - 10;
+#endif
 #else
     lv_coord_t width = LV_HOR_RES - 50;
 #endif
 
     lv_obj_t * content = lv_cont_create(par, NULL);
     lv_obj_add_style(content, LV_CONT_PART_MAIN, &lv_watch_cont_opa1);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_set_size(content, LV_HOR_RES - 100, 130);
+#else
     lv_obj_set_size(content, LV_HOR_RES - 32, 77);
+#endif
     lv_cont_set_layout(content, LV_LAYOUT_OFF);
     lv_obj_set_base_dir(content, LV_BIDI_DIR_LTR);
     LV_ASSERT_MEM(content);
@@ -366,7 +410,11 @@ static lv_obj_t * status_content_create(lv_obj_t * par)
     /*battery level*/
     char str[20] = {};
 
+       #ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_add_style(battery_label, LV_LABEL_PART_MAIN, &lv_watch_font24);
+       #else
     lv_obj_add_style(battery_label, LV_LABEL_PART_MAIN, &lv_watch_font14);
+       #endif
     snprintf(str, 20, "%d", Hal_Battery_Get_Status());
     lv_label_set_text(battery_label, str);
     lv_obj_set_click(battery_label, false);
@@ -377,7 +425,11 @@ static lv_obj_t * status_content_create(lv_obj_t * par)
     status_ext->charging_img = NULL;
     if(HAL_CHG_CONNECTED == Hal_Charger_Get_Status()) {
         if(Hal_Battery_Get_Status() == 100) {
+                       #ifdef USE_LV_WATCH_UI_466_466
+            lv_obj_add_style(battery_label, LV_LABEL_PART_MAIN, &lv_watch_font20);
+                       #else
             lv_obj_add_style(battery_label, LV_LABEL_PART_MAIN, &lv_watch_font10);
+                       #endif
             lv_label_set_text(battery_label, "OK");
             lv_obj_set_click(battery_label, false);
             lv_obj_align(battery_label, NULL, LV_ALIGN_CENTER, 0, 0);
@@ -393,7 +445,11 @@ static lv_obj_t * status_content_create(lv_obj_t * par)
     lv_obj_t * content_4 = cont_create(content, LV_LAYOUT_OFF, &lv_watch_style_transp, width);
     /*date*/
     status_ext->date_label = lv_label_create(content_4, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_add_style(status_ext->date_label, LV_LABEL_PART_MAIN, &lv_watch_font28);
+#else
     lv_obj_add_style(status_ext->date_label, LV_LABEL_PART_MAIN, &lv_watch_font20);
+#endif
     lv_obj_set_click(status_ext->date_label, false);
 
     lv_obj_t * content_5 = cont_create(content, LV_LAYOUT_OFF, &lv_watch_style_transp, width);
@@ -431,7 +487,11 @@ static void brightness_btn_action(lv_obj_t * obj, lv_event_t event)
     if(LV_EVENT_CLICKED == event)
        {
        #ifdef USE_LV_WATCH_UI_CIRCLE
+               #ifdef USE_LV_WATCH_UI_466_466
+               slider_create(NULL, SETTING_BRIGHTNESS, 205, brightness_slider_action);
+               #else
                slider_create(NULL, SETTING_BRIGHTNESS, 100, brightness_slider_action);
+               #endif
        #else
         slider_create(NULL, SETTING_BRIGHTNESS, 130, brightness_slider_action);
        #endif
@@ -443,7 +503,11 @@ static void volume_btn_action(lv_obj_t * obj, lv_event_t event)
     if(LV_EVENT_CLICKED == event)
        {
        #ifdef USE_LV_WATCH_UI_CIRCLE
+               #ifdef USE_LV_WATCH_UI_466_466
+               slider_create(NULL, SETTING_VOLUME, 205, volume_slider_action);
+               #else
                slider_create(NULL, SETTING_VOLUME, 100, volume_slider_action);
+               #endif
        #else
         slider_create(NULL, SETTING_VOLUME, 130, volume_slider_action);
        #endif

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 a951f6b..310dd04 100644 (file)
--- 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
@@ -89,14 +89,22 @@ lv_obj_t * lv_watch_list_create(lv_obj_t * activity_obj)
     lv_obj_align(content, obj, LV_ALIGN_CENTER, 0, 0);
 
     lv_obj_t * label_cont = lv_cont_create(content, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_set_size(label_cont, lv_obj_get_width(content), 50);
+#else
     lv_obj_set_size(label_cont, lv_obj_get_width(content), 30);
+#endif
     lv_obj_add_style(label_cont, LV_OBJ_PART_MAIN, &lv_watch_style_transp);
     lv_cont_set_layout(label_cont, LV_LAYOUT_OFF);
     lv_cont_set_fit2(label_cont, LV_FIT_TIGHT, LV_FIT_TIGHT);
     lv_obj_set_click(label_cont, false);
 
     lv_obj_t * label = lv_label_create(label_cont, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26_gray);
+#else
     lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font20_gray);
+#endif
     lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
     lv_label_set_text(label, "");
     lv_obj_set_click(label, false);
@@ -115,7 +123,11 @@ 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_CIRCLE
+       #ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_set_size(list, lv_obj_get_width(content), lv_obj_get_height(content) - lv_obj_get_height(label_cont) - 50);
+       #else
        lv_obj_set_size(list, lv_obj_get_width(content), lv_obj_get_height(content) - lv_obj_get_height(label_cont) - 35);
+       #endif
 #else
     lv_obj_set_size(list, lv_obj_get_width(content), lv_obj_get_height(content) - lv_obj_get_height(label_cont));
 #endif
@@ -171,12 +183,21 @@ lv_obj_t * lv_watch_list_add(lv_obj_t * obj, const void * img_src, watchLangTxtI
     lv_watch_obj_add_element(btn);
 
 #ifdef USE_LV_WATCH_UI_CIRCLE
+       #ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_set_style_local_pad_top(btn, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 6 + 6);
+       lv_obj_set_style_local_pad_bottom(btn, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 6 + 6);
+       lv_obj_set_style_local_pad_left(btn, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 95);
+       lv_obj_set_style_local_pad_right(btn, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 15);
+       lv_obj_set_style_local_pad_inner(btn, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 10);
+    lv_obj_set_style_local_bg_opa(btn, LV_BTN_PART_MAIN, LV_STATE_PRESSED, LV_OPA_TRANSP); // press effect
+       #else
        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);
        lv_obj_set_style_local_pad_right(btn, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 15);
        lv_obj_set_style_local_pad_inner(btn, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 10);
     lv_obj_set_style_local_bg_opa(btn, LV_BTN_PART_MAIN, LV_STATE_PRESSED, LV_OPA_TRANSP); // press effect
+       #endif
 #else
     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);
@@ -191,7 +212,11 @@ lv_obj_t * lv_watch_list_add(lv_obj_t * obj, const void * img_src, watchLangTxtI
     //set text id of btn label, it will update language when language changed
     lv_label_set_text_id(label, txtId);
 #ifdef __MMI_ZHSX_SUPPORT__
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font36);
+#else
        lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26);
+#endif
 #endif
 
     return btn;

diff --git a/2.sdk/sdk/gui/lv_watch/lv_objx/lv_watch_slider/lv_watch_slider.c b/2.sdk/sdk/gui/lv_watch/lv_objx/lv_watch_slider/lv_watch_slider.c
index 675e046..e04bfb8 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_objx/lv_watch_slider/lv_watch_slider.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_objx/lv_watch_slider/lv_watch_slider.c
@@ -118,14 +118,22 @@ lv_obj_t * slider_create(lv_obj_t * activity_obj, setting_type_t setting_type, l
     LV_ASSERT_MEM(content);
     if(content == NULL) return NULL;
     lv_obj_add_style(content, LV_CONT_PART_MAIN, &lv_watch_cont_opa2);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_set_size(content, 404, 84);
+#else
     lv_obj_set_size(content, 204, 44);
+#endif
     lv_obj_align(content, activity_obj, LV_ALIGN_IN_TOP_MID, 0, ver_offset);
     lv_cont_set_layout(content, LV_LAYOUT_OFF);
     lv_obj_set_click(content, true);
 
     lv_obj_t * slider = lv_slider_create(content, NULL);
     ext->slider = slider;
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_set_size(slider, 366, 44);
+#else
     lv_obj_set_size(slider, 186, 24);
+#endif
     lv_obj_align(slider, content, LV_ALIGN_CENTER, 0, 0);
 
     if(setting_type == SETTING_CALL_SPEAKER) {