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 604294c..ebb0b83 100644 (file)
--- 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
@@ -107,8 +107,13 @@ lv_obj_t * alarm_list_create(lv_obj_t * activity_obj)
 
     lv_obj_t * title = lv_label_create(obj, NULL);
     lv_label_set_text_id(title, WATCH_TEXT_ID_ALARM);
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_add_style(title, LV_LABEL_PART_MAIN, &lv_watch_font26_gray);
+       lv_obj_align(title, NULL, LV_ALIGN_IN_TOP_MID, 0, 20);
+#else
     lv_obj_add_style(title, LV_LABEL_PART_MAIN, &lv_watch_font20_gray);
     lv_obj_align(title, NULL, LV_ALIGN_IN_TOP_MID, 0, 10);
+#endif
 
     lv_obj_t * btn_add = lv_btn_create(obj, NULL);
     lv_obj_set_size(btn_add, LV_HOR_RES/5, LV_VER_RES/5);
@@ -124,7 +129,11 @@ lv_obj_t * alarm_list_create(lv_obj_t * activity_obj)
 
     lv_obj_t * list = lv_list_create(obj, NULL);
 #ifdef USE_LV_WATCH_UI_CIRCLE
+       #ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_set_size(list, LV_HOR_RES - 40, LV_VER_RES*4/5 - 60);
+       #else
     lv_obj_set_size(list, LV_HOR_RES - 40, LV_VER_RES*4/5 - 30);
+       #endif
 #else
     lv_obj_set_size(list, LV_HOR_RES, LV_VER_RES*4/5);
 #endif
@@ -188,7 +197,11 @@ lv_obj_t * alarm_list_create(lv_obj_t * activity_obj)
                lv_obj_set_hidden(list, true);
                
            lv_obj_t * label = lv_label_create(obj, NULL);
+       #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
            lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
            lv_label_set_text_id(label, WATCH_TEXT_ID_NO_ALARM);
            lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, -10);

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 e570895..22e2fdd 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/album/album.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/album/album.c
@@ -749,8 +749,13 @@ static lv_obj_t * album_photo_bg_create(lv_obj_t * par)
         lv_label_set_text_id(label_nophoto, WATCH_TEXT_ID_NOPHOTO);
         //lv_obj_align(label_nophoto, NULL, LV_ALIGN_IN_BOTTOM_MID, 10, -20);
         //lv_obj_add_style(label_nophoto, LV_LABEL_PART_MAIN, &lv_watch_font20_black);
+       #ifdef USE_LV_WATCH_UI_466_466
+               lv_obj_add_style(label_nophoto, LV_LABEL_PART_MAIN, &lv_watch_font36_black);
+               lv_obj_align(label_nophoto, NULL, LV_ALIGN_CENTER, 0, -10);
+       #else
         lv_obj_add_style(label_nophoto, LV_LABEL_PART_MAIN, &lv_watch_font26_black); // &lv_watch_font30_black);
         lv_obj_align(label_nophoto, NULL, LV_ALIGN_CENTER, 0, 0);
+       #endif
         lv_obj_set_click(label_nophoto, false);
 
     } else {
@@ -785,7 +790,11 @@ static lv_obj_t * album_photo_bg_create(lv_obj_t * par)
 
     lv_obj_t * label_ph = lv_label_create(cont, NULL);
     lv_label_set_text_id(label_ph, WATCH_TEXT_ID_ALBUM);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_add_style(label_ph, LV_LABEL_PART_MAIN, &lv_watch_font26_black);
+#else
     lv_obj_add_style(label_ph, LV_LABEL_PART_MAIN, &lv_watch_font20_black);
+#endif
     lv_obj_set_click(label_ph, false);
 
     lv_obj_t * img_setting = lv_img_create(cont, NULL);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_circle.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_circle.c
index f4103cb..aa2356a 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_circle.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_circle.c
@@ -1982,7 +1982,11 @@ lv_obj_t * wechat_create(lv_obj_t * activity_obj, lv_wechat_created_from_e from)
 
        // no network
        ext->label_no_network = lv_label_create(cont, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_add_style(ext->label_no_network, LV_LABEL_PART_MAIN, &lv_watch_font36_black);
+#else
        lv_obj_add_style(ext->label_no_network, LV_LABEL_PART_MAIN, &lv_watch_font26_black);
+#endif
        lv_label_set_text_id(ext->label_no_network, WATCH_TEXT_ID_DEVICE_NO_NETWORK);
        lv_label_set_align(ext->label_no_network, LV_LABEL_ALIGN_CENTER);
        lv_obj_align(ext->label_no_network, cont, LV_ALIGN_CENTER, 0, -10);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/stopwatch/stopwatch.c b/2.sdk/sdk/gui/lv_watch/lv_apps/stopwatch/stopwatch.c
index a762d4f..42d317c 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/stopwatch/stopwatch.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/stopwatch/stopwatch.c
@@ -98,6 +98,9 @@ lv_obj_t * stopwatch_create(lv_obj_t * activity_obj)
     } else if(STOPWATCH_STATE_PAUSE == sw_state) {
         lv_label_set_text_id(img_ext->label_title, WATCH_TEXT_ID_PAUSE);
     }
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_add_style(img_ext->label_title, LV_LABEL_PART_MAIN, &lv_watch_font36);
+#endif
     lv_obj_align(img_ext->label_title, img, LV_ALIGN_IN_TOP_MID, 0, height / 5);
 
     lv_obj_t * cont_time = lv_cont_create(img, NULL);
@@ -113,7 +116,11 @@ lv_obj_t * stopwatch_create(lv_obj_t * activity_obj)
     }
 
     img_ext->label_min_1 = lv_label_create(cont_time, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_add_style(img_ext->label_min_1, LV_LABEL_PART_MAIN, &lv_watch_font60);
+#else
     lv_obj_add_style(img_ext->label_min_1, LV_LABEL_PART_MAIN, &lv_watch_font40);
+#endif
     lv_label_set_long_mode(img_ext->label_min_1, LV_LABEL_LONG_BREAK);
     lv_obj_set_width(img_ext->label_min_1, STOPWATCH_LABEL_NON_MS_WIDTH);
     lv_label_set_align(img_ext->label_min_1, LV_LABEL_ALIGN_CENTER);
@@ -123,7 +130,11 @@ lv_obj_t * stopwatch_create(lv_obj_t * activity_obj)
     img_ext->label_sec_1 = lv_label_create(cont_time, img_ext->label_min_1);
     img_ext->label_sec_2 = lv_label_create(cont_time, img_ext->label_min_1);
     img_ext->label_ms_1 = lv_label_create(cont_time, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_add_style(img_ext->label_ms_1, LV_LABEL_PART_MAIN, &lv_watch_font40);
+#else
     lv_obj_add_style(img_ext->label_ms_1, LV_LABEL_PART_MAIN, &lv_watch_font30);
+#endif
     lv_label_set_long_mode(img_ext->label_ms_1, LV_LABEL_LONG_BREAK);
     lv_obj_set_width(img_ext->label_ms_1, STOPWATCH_LABEL_MS_WIDTH + STOPWATCH_LABEL_SPACE_WIDTH);
     lv_label_set_align(img_ext->label_ms_1, LV_LABEL_ALIGN_RIGHT);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/stopwatch/stopwatch.h b/2.sdk/sdk/gui/lv_watch/lv_apps/stopwatch/stopwatch.h
index 732d397..7786a45 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/stopwatch/stopwatch.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/stopwatch/stopwatch.h
@@ -26,10 +26,17 @@ extern "C" {
 /*********************
 *      DEFINES
 *********************/
+#ifdef USE_LV_WATCH_UI_466_466
+#define STOPWATCH_LABEL_NON_MS_WIDTH    (36)
+#define STOPWATCH_LABEL_MS_WIDTH        (26)
+#define STOPWATCH_LABEL_COLON_WIDTH     (9)
+#define STOPWATCH_LABEL_SPACE_WIDTH     (6)
+#else
 #define STOPWATCH_LABEL_NON_MS_WIDTH    (26) // for font 40
 #define STOPWATCH_LABEL_MS_WIDTH        (20) // for font 30
 #define STOPWATCH_LABEL_COLON_WIDTH     (9)
 #define STOPWATCH_LABEL_SPACE_WIDTH     (6)
+#endif
 
 /**********************
 *      TYPEDEFS

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 0e42e77..363b04c 100644 (file)
--- 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
@@ -150,8 +150,13 @@ lv_obj_t * timer_list_create(lv_obj_t * activity_obj)
     lv_obj_t * title = lv_label_create(obj, NULL);
     lv_label_set_text_id(title, WATCH_TEXT_ID_TIMER);
     lv_obj_set_size(title, LV_HOR_RES, LV_VER_RES/5);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_add_style(title, LV_LABEL_PART_MAIN, &lv_watch_font26_gray);
+    lv_obj_align(title, NULL, LV_ALIGN_IN_TOP_MID, 0, 20);
+#else
     lv_obj_add_style(title, LV_LABEL_PART_MAIN, &lv_watch_font20_gray);
     lv_obj_align(title, NULL, LV_ALIGN_IN_TOP_MID, 0, 10);
+#endif
 
     lv_obj_t * page  = lv_page_create(obj, NULL);
     lv_obj_set_size(page, LV_HOR_RES, LV_VER_RES*4/5);
@@ -163,10 +168,17 @@ lv_obj_t * timer_list_create(lv_obj_t * activity_obj)
 
     lv_obj_t * cont = lv_cont_create(page, NULL);
 #ifdef USE_LV_WATCH_UI_CIRCLE
+       #ifdef USE_LV_WATCH_UI_466_466
+       uint8_t item_row = TIMER_ITEM_NUM;
+       uint8_t item_h = 200;
+       uint8_t item_w = item_h;
+       uint8_t item_pad_inner = LV_HOR_RES/24;
+       #else
        uint8_t item_row = TIMER_ITEM_NUM;
        uint8_t item_h = 100;
        uint8_t item_w = item_h;
        uint8_t item_pad_inner = LV_HOR_RES/24;
+       #endif
 #else
     uint8_t item_col = 2;
     uint8_t item_row = (TIMER_ITEM_NUM % item_col == 0) ? (TIMER_ITEM_NUM / item_col) : (TIMER_ITEM_NUM / item_col + 1);
@@ -199,6 +211,9 @@ lv_obj_t * timer_list_create(lv_obj_t * activity_obj)
         lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
         lv_label_set_long_mode(label, LV_LABEL_LONG_BREAK);
         lv_obj_set_width(label, lv_obj_get_width(btn));
+       #ifdef USE_LV_WATCH_UI_466_466
+               lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font36);
+       #endif
         lv_label_set_text_id(label, timer_item[i].txt_id);
         lv_obj_set_click(label, false);
 
@@ -327,8 +342,13 @@ static lv_obj_t * timer_create(lv_obj_t * activity_obj)
 
     lv_obj_t * label_time_remaining = lv_label_create(obj, NULL);
     lv_label_set_text(label_time_remaining, str);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_add_style(label_time_remaining, LV_LABEL_PART_MAIN, &lv_watch_font36);
+       lv_obj_align(label_time_remaining, NULL, LV_ALIGN_CENTER, 0, -20);
+#else
     lv_obj_add_style(label_time_remaining, LV_LABEL_PART_MAIN, &lv_watch_font30);
     lv_obj_align(label_time_remaining, NULL, LV_ALIGN_CENTER, 0, 0);
+#endif
     lv_obj_set_base_dir(label_time_remaining, LV_BIDI_DIR_LTR);
     ext->label_time_remaining = label_time_remaining;
 
@@ -338,8 +358,13 @@ static lv_obj_t * timer_create(lv_obj_t * activity_obj)
     } else {
         lv_label_set_text_id(label_info, WATCH_TEXT_ID_TIMER);
     }
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_add_style(label_info, LV_LABEL_PART_MAIN, &lv_watch_font36);
+       lv_obj_align(label_info, label_time_remaining, LV_ALIGN_OUT_TOP_MID, 0, -20);
+#else
     lv_obj_add_style(label_info, LV_LABEL_PART_MAIN, &lv_watch_font20);
     lv_obj_align(label_info, label_time_remaining, LV_ALIGN_OUT_TOP_MID, 0, -10);
+#endif
     ext->label_info = label_info;
 
     //stop btn
@@ -350,6 +375,8 @@ static lv_obj_t * timer_create(lv_obj_t * activity_obj)
        lv_obj_align(btn_stop, NULL, LV_ALIGN_IN_BOTTOM_LEFT, LV_HOR_RES*90/360, -LV_VER_RES*40/360 - 35);
 #elif USE_LV_WATCH_UI_240_280
        lv_obj_align(btn_stop, NULL, LV_ALIGN_IN_BOTTOM_LEFT, LV_HOR_RES*90/360, -LV_VER_RES*40/360 - 20);
+#elif USE_LV_WATCH_UI_466_466
+       lv_obj_align(btn_stop, NULL, LV_ALIGN_IN_BOTTOM_LEFT, LV_HOR_RES*90/360 - 20, -LV_VER_RES*40/360 - 20);
 #else
     lv_obj_align(btn_stop, NULL, LV_ALIGN_IN_BOTTOM_LEFT, LV_HOR_RES*90/360, -LV_VER_RES*40/360);
 #endif
@@ -369,6 +396,8 @@ static lv_obj_t * timer_create(lv_obj_t * activity_obj)
     lv_obj_align(btn_start, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -LV_HOR_RES*90/360, -LV_VER_RES*40/360 - 35);
 #elif USE_LV_WATCH_UI_240_280
        lv_obj_align(btn_start, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -LV_HOR_RES*90/360, -LV_VER_RES*40/360 - 20);
+#elif USE_LV_WATCH_UI_466_466
+       lv_obj_align(btn_start, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -LV_HOR_RES*90/360 + 20, -LV_VER_RES*40/360 - 20);
 #else
     lv_obj_align(btn_start, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -LV_HOR_RES*90/360, -LV_VER_RES*40/360);
 #endif
@@ -384,6 +413,8 @@ static lv_obj_t * timer_create(lv_obj_t * activity_obj)
     lv_obj_align(btn_pause, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -LV_HOR_RES*90/360, -LV_VER_RES*40/360 - 35);
 #elif USE_LV_WATCH_UI_240_280
        lv_obj_align(btn_pause, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -LV_HOR_RES*90/360, -LV_VER_RES*40/360 - 20);
+#elif USE_LV_WATCH_UI_466_466
+       lv_obj_align(btn_pause, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -LV_HOR_RES*90/360 + 20, -LV_VER_RES*40/360 - 20);
 #else
     lv_obj_align(btn_pause, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -LV_HOR_RES*90/360, -LV_VER_RES*40/360);
 #endif
@@ -440,7 +471,11 @@ static void timer_label_anim_cb(lv_anim_t * anim)
 
     if(anim->var) {
         lv_label_set_text(anim->var, str);
+       #ifdef USE_LV_WATCH_UI_466_466
+               lv_obj_align(anim->var, NULL, LV_ALIGN_CENTER, 0, -20);
+       #else
         lv_obj_align(anim->var, NULL, LV_ALIGN_CENTER, 0, 0);
+       #endif
     }
 }
 
@@ -631,7 +666,11 @@ static void timer_start_action(lv_obj_t * btn, lv_event_t e)
 
     //show pause btn
     lv_label_set_text_id(ext->label_info, WATCH_TEXT_ID_TIMER);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_align(ext->label_info, ext->label_time_remaining, LV_ALIGN_OUT_TOP_MID, 0, -20);
+#else
     lv_obj_align(ext->label_info, ext->label_time_remaining, LV_ALIGN_OUT_TOP_MID, 0, -10);
+#endif
     lv_obj_set_hidden(ext->btn_start, true);
     lv_obj_set_hidden(ext->btn_pause, false);
 
@@ -696,7 +735,11 @@ static void timer_pause_action(lv_obj_t * btn, lv_event_t e)
     char str[TIMER_TIME_STR_LENGTH];
     timer_get_time_remaining_str(timer_remaining, str, TIMER_TIME_STR_LENGTH);
     lv_label_set_text(ext->label_time_remaining, str);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_align(ext->label_time_remaining, NULL, LV_ALIGN_CENTER, 0, -20);
+#else
     lv_obj_align(ext->label_time_remaining, NULL, LV_ALIGN_CENTER, 0, 0);
+#endif
 }
 
 #ifdef BUILD_IN_PC_SIMULATOR
@@ -885,12 +928,21 @@ static lv_obj_t * timer_set_time_roller_create(lv_obj_t * par, hal_rtc_t * date_
 
     lv_timer_list_obj_ext_t * ext = timer_list_get_ext();
 
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_t * label = lv_label_create(par, NULL);
+       lv_label_set_text_id(label, WATCH_TEXT_ID_TIME_SETTING);
+       lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26_gray);
+       lv_label_set_long_mode(label, LV_LABEL_LONG_BREAK);
+       lv_obj_set_height(label, LV_VER_RES/5);
+       lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 20);
+#else
     lv_obj_t * label = lv_label_create(par, NULL);
     lv_label_set_text_id(label, WATCH_TEXT_ID_TIME_SETTING);
     lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20_gray);
     lv_label_set_long_mode(label, LV_LABEL_LONG_BREAK);
     lv_obj_set_height(label, LV_VER_RES/5);
     lv_obj_align(label, NULL, LV_ALIGN_IN_TOP_MID, 0, 10);
+#endif
 
     content =  lv_cont_create(par, NULL);
     lv_obj_set_size(content, LV_HOR_RES, LV_VER_RES / 2);
@@ -913,6 +965,15 @@ static lv_obj_t * timer_set_time_roller_create(lv_obj_t * par, hal_rtc_t * date_
 
     roller1 = lv_roller_create(roller1_cont, NULL);
     ext->roller[0] = roller1;
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_add_style(roller1, LV_ROLLER_PART_BG, &lv_watch_font26_gray);
+       lv_obj_set_style_local_text_line_space(roller1, LV_ROLLER_PART_BG, LV_STATE_DEFAULT, 26);
+       lv_obj_set_style_local_bg_opa(roller1, LV_ROLLER_PART_BG, LV_STATE_DEFAULT, LV_OPA_TRANSP);
+       lv_obj_add_style(roller1, LV_ROLLER_PART_SELECTED, &lv_watch_font26_gray);
+       lv_obj_set_style_local_text_line_space(roller1, LV_ROLLER_PART_SELECTED, LV_STATE_DEFAULT, 26);
+       lv_obj_set_style_local_bg_opa(roller1, LV_ROLLER_PART_SELECTED, LV_STATE_DEFAULT, LV_OPA_TRANSP);
+       lv_roller_set_visible_row_count(roller1, 3);
+#else
     lv_obj_add_style(roller1, LV_ROLLER_PART_BG, &lv_watch_font20_gray);
     lv_obj_set_style_local_text_line_space(roller1, LV_ROLLER_PART_BG, LV_STATE_DEFAULT, 20);
     lv_obj_set_style_local_bg_opa(roller1, LV_ROLLER_PART_BG, LV_STATE_DEFAULT, LV_OPA_TRANSP);
@@ -920,6 +981,7 @@ static lv_obj_t * timer_set_time_roller_create(lv_obj_t * par, hal_rtc_t * date_
     lv_obj_set_style_local_text_line_space(roller1, LV_ROLLER_PART_SELECTED, LV_STATE_DEFAULT, 20);
     lv_obj_set_style_local_bg_opa(roller1, LV_ROLLER_PART_SELECTED, LV_STATE_DEFAULT, LV_OPA_TRANSP);
     lv_roller_set_visible_row_count(roller1, 3);
+#endif
 
     /*label1*/
     label1 = lv_label_create(content, NULL);
@@ -931,6 +993,15 @@ static lv_obj_t * timer_set_time_roller_create(lv_obj_t * par, hal_rtc_t * date_
     roller2_cont = lv_cont_create(content, roller1_cont);
     roller2 = lv_roller_create(roller2_cont, NULL);
     ext->roller[1] = roller2;
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_add_style(roller2, LV_ROLLER_PART_BG, &lv_watch_font26_gray);
+       lv_obj_set_style_local_text_line_space(roller2, LV_ROLLER_PART_BG, LV_STATE_DEFAULT, 26);
+       lv_obj_set_style_local_bg_opa(roller2, LV_ROLLER_PART_BG, LV_STATE_DEFAULT, LV_OPA_TRANSP);
+       lv_obj_add_style(roller2, LV_ROLLER_PART_SELECTED, &lv_watch_font26_gray);
+       lv_obj_set_style_local_text_line_space(roller2, LV_ROLLER_PART_SELECTED, LV_STATE_DEFAULT, 26);
+       lv_obj_set_style_local_bg_opa(roller2, LV_ROLLER_PART_SELECTED, LV_STATE_DEFAULT, LV_OPA_TRANSP);
+       lv_roller_set_visible_row_count(roller2, 3);
+#else
     lv_obj_add_style(roller2, LV_ROLLER_PART_BG, &lv_watch_font20_gray);
     lv_obj_set_style_local_text_line_space(roller2, LV_ROLLER_PART_BG, LV_STATE_DEFAULT, 20);
     lv_obj_set_style_local_bg_opa(roller2, LV_ROLLER_PART_BG, LV_STATE_DEFAULT, LV_OPA_TRANSP);
@@ -938,6 +1009,7 @@ static lv_obj_t * timer_set_time_roller_create(lv_obj_t * par, hal_rtc_t * date_
     lv_obj_set_style_local_text_line_space(roller2, LV_ROLLER_PART_SELECTED, LV_STATE_DEFAULT, 20);
     lv_obj_set_style_local_bg_opa(roller2, LV_ROLLER_PART_SELECTED, LV_STATE_DEFAULT, LV_OPA_TRANSP);
     lv_roller_set_visible_row_count(roller2, 3);
+#endif
 
     /*label2*/
     label2 = lv_label_create(content, label1);
@@ -947,6 +1019,15 @@ static lv_obj_t * timer_set_time_roller_create(lv_obj_t * par, hal_rtc_t * date_
     roller3_cont = lv_cont_create(content, roller1_cont);
     roller3 = lv_roller_create(roller3_cont, NULL);
     ext->roller[2] = roller3;
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_add_style(roller3, LV_ROLLER_PART_BG, &lv_watch_font26_gray);
+       lv_obj_set_style_local_text_line_space(roller3, LV_ROLLER_PART_BG, LV_STATE_DEFAULT, 26);
+       lv_obj_set_style_local_bg_opa(roller3, LV_ROLLER_PART_BG, LV_STATE_DEFAULT, LV_OPA_TRANSP);
+       lv_obj_add_style(roller3, LV_ROLLER_PART_SELECTED, &lv_watch_font26_gray);
+       lv_obj_set_style_local_text_line_space(roller3, LV_ROLLER_PART_SELECTED, LV_STATE_DEFAULT, 26);
+       lv_obj_set_style_local_bg_opa(roller3, LV_ROLLER_PART_SELECTED, LV_STATE_DEFAULT, LV_OPA_TRANSP);
+       lv_roller_set_visible_row_count(roller3, 3);
+#else
     lv_obj_add_style(roller3, LV_ROLLER_PART_BG, &lv_watch_font20_gray);
     lv_obj_set_style_local_text_line_space(roller3, LV_ROLLER_PART_BG, LV_STATE_DEFAULT, 20);
     lv_obj_set_style_local_bg_opa(roller3, LV_ROLLER_PART_BG, LV_STATE_DEFAULT, LV_OPA_TRANSP);
@@ -954,6 +1035,7 @@ static lv_obj_t * timer_set_time_roller_create(lv_obj_t * par, hal_rtc_t * date_
     lv_obj_set_style_local_text_line_space(roller3, LV_ROLLER_PART_SELECTED, LV_STATE_DEFAULT, 20);
     lv_obj_set_style_local_bg_opa(roller3, LV_ROLLER_PART_SELECTED, LV_STATE_DEFAULT, LV_OPA_TRANSP);
     lv_roller_set_visible_row_count(roller3, 3);
+#endif
 
     lv_watch_set_free_num(roller1, 1);
     lv_watch_set_free_num(roller2, 2);
@@ -1049,13 +1131,21 @@ static lv_obj_t * timer_set_time_opt_create(lv_obj_t * par)
     btn = lv_imgbtn_create(par, NULL);
     lv_imgbtn_set_src(btn, LV_BTN_STATE_RELEASED, ICON_TIMER_STOP);
     lv_imgbtn_set_src(btn, LV_BTN_STATE_PRESSED, ICON_TIMER_STOP);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_align(btn, NULL, LV_ALIGN_IN_BOTTOM_LEFT, LV_HOR_RES*90/360 - 20, -LV_VER_RES*40/360 - 20);
+#else
     lv_obj_align(btn, NULL, LV_ALIGN_IN_BOTTOM_LEFT, LV_HOR_RES*90/360, -LV_VER_RES*40/360);
+#endif
     lv_obj_set_event_cb(btn, timer_set_time_cancel_btn_action);
 
     btn = lv_imgbtn_create(par, NULL);
     lv_imgbtn_set_src(btn, LV_BTN_STATE_RELEASED, ICON_TIMER_START);
     lv_imgbtn_set_src(btn, LV_BTN_STATE_PRESSED, ICON_TIMER_START);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_align(btn, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -LV_HOR_RES*90/360 + 20, -LV_VER_RES*40/360 - 20);
+#else
     lv_obj_align(btn, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -LV_HOR_RES*90/360, -LV_VER_RES*40/360);
+#endif
     lv_obj_set_event_cb(btn, timer_set_time_ok_btn_action);
 
     return par;

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 3cb33e8..c0c0db6 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/weather/weather.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/weather/weather.c
@@ -43,7 +43,11 @@ static lv_obj_t * weather_content_no_info_create(lv_obj_t * par)
     lv_img_set_src(img, s_weather_list[count - 1].img_src);
 
     lv_obj_t * label = lv_label_create(content, NULL);
+#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, s_weather_list[count - 1].txtId);
     lv_obj_set_click(label, false);
 
@@ -79,7 +83,11 @@ static lv_obj_t * weather_content_info_create(lv_obj_t * par, app_adaptor_weathe
     lv_obj_align(img, NULL, LV_ALIGN_IN_TOP_MID, 0, 0);
 
     lv_obj_t * label_describe = lv_label_create(content, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_add_style(label_describe, LV_LABEL_PART_MAIN, &lv_watch_font36_yellow);
+#else
     lv_obj_add_style(label_describe, LV_LABEL_PART_MAIN, &lv_watch_font26_yellow);
+#endif
 
        char label_str[32] = "";
        char * uincode_str = "2103"; // \u2103
@@ -96,7 +104,11 @@ static lv_obj_t * weather_content_info_create(lv_obj_t * par, app_adaptor_weathe
     lv_obj_align(label_describe, img, LV_ALIGN_OUT_BOTTOM_MID, 0, 5);
 
     lv_obj_t * label_city = lv_label_create(content, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
+    lv_obj_add_style(label_city, LV_LABEL_PART_MAIN, &lv_watch_font36);
+#else
     lv_obj_add_style(label_city, LV_LABEL_PART_MAIN, &lv_watch_font26);
+#endif
     lv_label_set_text(label_city, weather->city);
        lv_label_set_long_mode(label_city, LV_LABEL_LONG_SROLL_CIRC);
     lv_obj_set_click(label_city, false);
@@ -134,13 +146,21 @@ void weather_update(lv_obj_t * cont)
     if(0 == strlen(weather_info.city))
        {               
         weather_ext->content1 = weather_content_no_info_create(cont);
+       #ifdef USE_LV_WATCH_UI_466_466
+               lv_obj_align(weather_ext->content1, cont, LV_ALIGN_IN_TOP_MID, 0, 70);
+       #else
         lv_obj_align(weather_ext->content1, cont, LV_ALIGN_IN_TOP_MID, 0, 20);
+       #endif
     } 
        else 
        {               
                weather_ext->content1 = weather_content_info_create(cont, &weather_info);
        #ifdef USE_LV_WATCH_UI_CIRCLE
+               #ifdef USE_LV_WATCH_UI_466_466
+        lv_obj_align(weather_ext->content1, cont, LV_ALIGN_IN_TOP_MID, 0, 50);
+               #else
         lv_obj_align(weather_ext->content1, cont, LV_ALIGN_IN_TOP_MID, 0, 5);
+               #endif
        #else
         lv_obj_align(weather_ext->content1, cont, LV_ALIGN_IN_TOP_MID, 0, 30);
        #endif

diff --git a/2.sdk/sdk/gui/lv_watch/lv_theme_watch_night.c b/2.sdk/sdk/gui/lv_watch/lv_theme_watch_night.c
index b76bd1f..8e0e1aa 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_theme_watch_night.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_theme_watch_night.c
@@ -248,6 +248,7 @@ lv_style_t lv_watch_font32_black;
 lv_style_t lv_watch_font36;
 lv_style_t lv_watch_font36_black;
 lv_style_t lv_watch_font36_gray;
+lv_style_t lv_watch_font36_yellow;
 lv_style_t lv_watch_font60;
 lv_style_t lv_watch_font60_black;
 #endif
@@ -1137,6 +1138,10 @@ static void lv_theme_watch_set_private_style(void)
        lv_style_set_text_color(&lv_watch_font36_gray, LV_STATE_DEFAULT, LV_COLOR_GRAY);
        lv_style_set_text_font(&lv_watch_font36_gray, LV_STATE_DEFAULT, &lv_font_ttf_36);
 
+       style_init_reset(&lv_watch_font36_yellow);
+       lv_style_set_text_color(&lv_watch_font36_yellow, LV_STATE_DEFAULT, LV_COLOR_YELLOW);
+       lv_style_set_text_font(&lv_watch_font36_yellow, LV_STATE_DEFAULT, &lv_font_ttf_36);
+
        style_init_reset(&lv_watch_font60);
        lv_style_set_text_color(&lv_watch_font60, LV_STATE_DEFAULT, LV_COLOR_WHITE);
        lv_style_set_text_font(&lv_watch_font60, LV_STATE_DEFAULT, &lv_font_ttf_60);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_theme_watch_night.h b/2.sdk/sdk/gui/lv_watch/lv_theme_watch_night.h
index 4674326..6955323 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_theme_watch_night.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_theme_watch_night.h
@@ -153,6 +153,7 @@ extern lv_style_t lv_watch_font32_black;
 extern lv_style_t lv_watch_font36;
 extern lv_style_t lv_watch_font36_black;
 extern lv_style_t lv_watch_font36_gray;
+extern lv_style_t lv_watch_font36_yellow;
 extern lv_style_t lv_watch_font60;
 extern lv_style_t lv_watch_font60_black;
 #endif

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 f77ab67..be60f58 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c
+++ b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c
@@ -795,7 +795,8 @@ static lv_obj_t * mmi_watch_charging_prompt_screen_create(lv_obj_t * activity_ob
        lv_msgbox_start_auto_close(mbox, 2000);
 #else
        lv_obj_t * cont = lv_cont_create(obj, NULL);
-       lv_obj_set_size(cont, 180, 180); // (cont, LV_HOR_RES, LV_VER_RES);
+       //lv_obj_set_size(cont, 180, 180);
+       lv_obj_set_size(cont, LV_HOR_RES, LV_VER_RES);
        lv_obj_set_style_local_bg_color(cont, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
        //lv_obj_set_style_local_radius(cont, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 30);
        lv_obj_align(cont, NULL, LV_ALIGN_CENTER, 0, 0);
@@ -804,14 +805,20 @@ static lv_obj_t * mmi_watch_charging_prompt_screen_create(lv_obj_t * activity_ob
 
        lv_obj_t * img = lv_img_create(cont, NULL);
        lv_img_set_src(img, ((HAL_CHG_CONNECTED == (HAL_CHG_STATUS)chg_status) ? ICON_CHARGE_CONNECTED : ICON_CHARGE_REMOVED));
-       lv_obj_align(img, NULL, LV_ALIGN_IN_TOP_MID, 0, 0);
+       lv_obj_align(img, NULL, LV_ALIGN_CENTER, 0, -LV_VER_RES/10);
        lv_obj_set_click(img, false);
        
        lv_obj_t * label = lv_label_create(cont, NULL);
        lv_label_set_text_id(label, ((HAL_CHG_CONNECTED == (HAL_CHG_STATUS)chg_status) ? WATCH_TEXT_ID_CHARGE_CONNECTED : WATCH_TEXT_ID_CHARGE_REMOVED));
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font36);
+       lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
+       lv_obj_align(label, img, LV_ALIGN_OUT_BOTTOM_MID, 0, 30);
+#else
        lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26);
        lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
        lv_obj_align(label, img, LV_ALIGN_OUT_BOTTOM_MID, 0, 20);
+#endif
 
        mmi_watch_charging_prompt_timer_stop();
        s_watch_charge_prompt_timer = Hal_Timer_Start(1500, mmi_watch_charging_prompt_cb, NULL, false);