gengxin

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_test.c b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_test.c
index f86930b..6841d40 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_test.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_test.c
@@ -427,6 +427,8 @@ static lv_obj_t * factorymode_speaker_create(lv_obj_t * activity_obj)
 #else
     lv_obj_add_style(label,LV_OBJ_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT);
 #endif
+    lv_label_set_long_mode(label, LV_LABEL_LONG_SROLL);
+    lv_obj_set_width(label, LV_HOR_RES * 5 / 6);
     lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
     lv_obj_set_click(label, false);
     lv_label_set_text_id(label, WATCH_TEXT_ID_PLAYING);
@@ -967,6 +969,8 @@ static lv_obj_t * factorymode_wifi_create(lv_obj_t * activity_obj)
 
     ext->label_rslt = lv_label_create(content, NULL);
     lv_obj_add_style(ext->label_rslt,LV_OBJ_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT);
+    lv_label_set_long_mode(ext->label_rslt, LV_LABEL_LONG_SROLL);
+    lv_obj_set_width(ext->label_rslt, LV_HOR_RES * 5 / 6);
     lv_label_set_align(ext->label_rslt, LV_LABEL_ALIGN_CENTER);
     lv_obj_set_click(ext->label_rslt, false);
     lv_label_set_text_id(ext->label_rslt, WATCH_TEXT_ID_WIFI_SCAN_TESTING);
@@ -1913,15 +1917,17 @@ static lv_obj_t * mmi_factorymode_live_calibration_create(lv_obj_t * activity_ob
        
        lv_obj_t * label_start = lv_label_create(btn_start, NULL);
        lv_label_set_text_id(label_start, WATCH_TEXT_ID_START_TEST);
-       lv_obj_add_style(label_start,LV_OBJ_PART_MAIN, &lv_watch_font20);
+       lv_obj_add_style(label_start,LV_OBJ_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT); // &lv_watch_font20);
        lv_label_set_align(label_start, LV_LABEL_ALIGN_CENTER);
        lv_obj_align(label_start, NULL, LV_ALIGN_CENTER, 0, 0);
 
 
        lv_obj_t * label_prompt = lv_label_create(content, NULL);
-       lv_obj_add_style(label_prompt, LV_LABEL_PART_MAIN, &lv_watch_font26);
+       lv_obj_add_style(label_prompt, LV_LABEL_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT); // &lv_watch_font26);
+    lv_label_set_long_mode(label_prompt, LV_LABEL_LONG_SROLL);
+    lv_obj_set_width(label_prompt, LV_HOR_RES * 5 / 6);
        lv_label_set_text_id(label_prompt, WATCH_TEXT_ID_LIVE_CALIBRATION_PROMPT);
-    lv_obj_set_width(label_prompt, LV_HOR_RES - 40);
+    //lv_obj_set_width(label_prompt, LV_HOR_RES - 40);
        lv_obj_align(label_prompt, btn_start, LV_ALIGN_OUT_TOP_MID, 0, -10);
 
     return obj;
@@ -1942,7 +1948,7 @@ static void mmi_factorymode_wear_test_status_update(lv_anim_t * anim)
     bool wear_state = false;
        
        wear_state = mmi_health_measure_wear_state_get();
-    sprintf(str, "%s: %s", (char *)lv_lang_get_text(WATCH_TEXT_ID_WEAR_STATE),
+    sprintf(str, "%s:\n                        %s", (char *)lv_lang_get_text(WATCH_TEXT_ID_WEAR_STATE),
                                                (wear_state ? (char *)lv_lang_get_text(WATCH_TEXT_ID_WEARING) : (char *)lv_lang_get_text(WATCH_TEXT_ID_NO_WEAR)));
     lv_label_set_text(anim->var, str);
 }
@@ -2116,15 +2122,17 @@ static lv_obj_t * mmi_factorymode_light_leak_test_create(lv_obj_t * activity_obj
        
        lv_obj_t * label_start = lv_label_create(btn_start, NULL);
        lv_label_set_text_id(label_start, WATCH_TEXT_ID_START_TEST);
-       lv_obj_add_style(label_start,LV_OBJ_PART_MAIN, &lv_watch_font20);
+       lv_obj_add_style(label_start,LV_OBJ_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT); // &lv_watch_font20);
        lv_label_set_align(label_start, LV_LABEL_ALIGN_CENTER);
        lv_obj_align(label_start, NULL, LV_ALIGN_CENTER, 0, 0);
 
        
        lv_obj_t * label_prompt = lv_label_create(content, NULL);
-       lv_obj_add_style(label_prompt, LV_LABEL_PART_MAIN, &lv_watch_font26);
+       lv_obj_add_style(label_prompt, LV_LABEL_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT); // &lv_watch_font26);
+    lv_label_set_long_mode(label_prompt, LV_LABEL_LONG_SROLL);
+    lv_obj_set_width(label_prompt, LV_HOR_RES * 5 / 6);
        lv_label_set_text_id(label_prompt, WATCH_TEXT_ID_LIVE_CALIBRATION_PROMPT);
-       lv_obj_set_width(label_prompt, LV_HOR_RES - 40);
+       //lv_obj_set_width(label_prompt, LV_HOR_RES - 40);
        lv_obj_align(label_prompt, btn_start, LV_ALIGN_OUT_TOP_MID, 0, -10);
 
        return obj;
@@ -2238,8 +2246,10 @@ static lv_obj_t * mmi_factorymode_light_leak_test_create(lv_obj_t * activity_obj
        
        lv_obj_t * label_prompt = lv_label_create(content, NULL);
        lv_obj_add_style(label_prompt, LV_LABEL_PART_MAIN, &FACTORY_MODE_TEST_ITEM_TEXT_FONT_BIG);
+    lv_label_set_long_mode(label_prompt, LV_LABEL_LONG_SROLL);
+    lv_obj_set_width(label_prompt, LV_HOR_RES * 5 / 6);
        lv_label_set_text_id(label_prompt, WATCH_TEXT_ID_LIVE_CALIBRATION_PROMPT);
-       lv_obj_set_width(label_prompt, LV_HOR_RES - 40);
+       //lv_obj_set_width(label_prompt, LV_HOR_RES - 40);
        //lv_obj_align(label_prompt, btn_start, LV_ALIGN_OUT_BOTTOM_MID, 0, -10);
        lv_obj_align(label_prompt, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, -LV_VER_RES / 8);
 

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/pedometer/pedometer.c b/2.sdk/sdk/gui/lv_watch/lv_apps/pedometer/pedometer.c
index fcec455..9c93f5b 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/pedometer/pedometer.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/pedometer/pedometer.c
@@ -168,18 +168,30 @@ lv_obj_t * mmi_step_goal_set_cont_create(lv_obj_t * tab, lv_obj_t * tileview)
     lv_imgbtn_set_src(btn_decrease, LV_BTN_STATE_RELEASED, ICON_DECREASE);
     lv_imgbtn_set_src(btn_decrease, LV_BTN_STATE_PRESSED, ICON_DECREASE);
     lv_obj_set_event_cb(btn_decrease, mmi_step_goal_set_btn_event_cb);
+#ifdef USE_LV_WATCH_UI_466_466
        lv_obj_align(btn_decrease, NULL, LV_ALIGN_IN_LEFT_MID, LV_HOR_RES / 8, -LV_VER_RES / 8);
+#else
+       lv_obj_align(btn_decrease, NULL, LV_ALIGN_IN_LEFT_MID, LV_HOR_RES / 12, -LV_VER_RES / 8);
+#endif
        lv_watch_set_free_num(btn_decrease, 1);
 
     lv_obj_t * btn_increase = lv_imgbtn_create(cont, NULL);
     lv_imgbtn_set_src(btn_increase, LV_BTN_STATE_RELEASED, ICON_INCREASE);
     lv_imgbtn_set_src(btn_increase, LV_BTN_STATE_PRESSED, ICON_INCREASE);
     lv_obj_set_event_cb(btn_increase, mmi_step_goal_set_btn_event_cb);
+#ifdef USE_LV_WATCH_UI_466_466
        lv_obj_align(btn_increase, NULL, LV_ALIGN_IN_RIGHT_MID, -LV_HOR_RES / 8, -LV_VER_RES / 8);
+#else
+       lv_obj_align(btn_increase, NULL, LV_ALIGN_IN_RIGHT_MID, -LV_HOR_RES / 12, -LV_VER_RES / 8);
+#endif
        lv_watch_set_free_num(btn_increase, 2);
 
        lv_obj_t * label_goal = lv_label_create(cont, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
        lv_obj_add_style(label_goal, LV_LABEL_PART_MAIN, &lv_watch_font40);
+#else
+       lv_obj_add_style(label_goal, LV_LABEL_PART_MAIN, &lv_watch_font26);
+#endif
     char str[8] = "";
        s_step_goal_temp_value = pedometer_get_goalsteps();
     sprintf(str, "%d", s_step_goal_temp_value);
@@ -190,24 +202,40 @@ lv_obj_t * mmi_step_goal_set_cont_create(lv_obj_t * tab, lv_obj_t * tileview)
        s_step_label_goal_set = label_goal;
 
        lv_obj_t * btn_cancel = lv_btn_create(cont, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
        lv_obj_set_size(btn_cancel, 140, 70);
+#else
+       lv_obj_set_size(btn_cancel, 100, 56);
+#endif
        lv_obj_set_style_local_bg_color(btn_cancel, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_MAKE(0x47, 0xA6, 0xFF));
        lv_obj_set_style_local_radius(btn_cancel, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 30);
        lv_obj_set_style_local_bg_color(btn_cancel, LV_BTN_PART_MAIN, LV_STATE_PRESSED, LV_COLOR_MAKE(0x47, 0xA6, 0xFF));
        lv_obj_set_style_local_radius(btn_cancel, LV_BTN_PART_MAIN, LV_STATE_PRESSED, 30);
+#ifdef USE_LV_WATCH_UI_466_466
        lv_obj_align(btn_cancel, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 70, -60);
+#else
+       lv_obj_align(btn_cancel, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 10, -20);
+#endif
        lv_obj_set_event_cb(btn_cancel, mmi_step_goal_set_btn_event_cb);
        lv_watch_set_free_num(btn_cancel, 3);
        lv_obj_t * label_cancel = lv_label_create(btn_cancel, NULL);
        lv_label_set_text_id(label_cancel, WATCH_TEXT_ID_CANCEL);
+#ifdef USE_LV_WATCH_UI_466_466
        lv_obj_add_style(label_cancel, LV_LABEL_PART_MAIN, &lv_watch_font40_black);
+#else
+       lv_obj_add_style(label_cancel, LV_LABEL_PART_MAIN, &lv_watch_font26_black);
+#endif
 
        lv_obj_t * btn_ok = lv_btn_create(cont, btn_cancel);
        lv_obj_set_style_local_bg_color(btn_ok, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_MAKE(0xFF, 0x6F, 0x91));
        lv_obj_set_style_local_radius(btn_ok, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 30);
        lv_obj_set_style_local_bg_color(btn_ok, LV_BTN_PART_MAIN, LV_STATE_PRESSED, LV_COLOR_MAKE(0xFF, 0x6F, 0x91));
        lv_obj_set_style_local_radius(btn_ok, LV_BTN_PART_MAIN, LV_STATE_PRESSED, 30);
+#ifdef USE_LV_WATCH_UI_466_466
        lv_obj_align(btn_ok, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -70, -60);
+#else
+       lv_obj_align(btn_ok, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, -10, -20);
+#endif
        lv_obj_set_event_cb(btn_ok, mmi_step_goal_set_btn_event_cb);
        lv_watch_set_free_num(btn_ok, 4);
        lv_obj_t * label_ok = lv_label_create(btn_ok, label_cancel);
@@ -250,7 +278,11 @@ lv_obj_t * pedometer_create(lv_obj_t * tileview, uint16_t id)
     lv_obj_set_click(cont_today, false);
 
     lv_obj_t * label = lv_label_create(cont_today, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
        lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font40);
+#else
+       lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26);
+#endif
     lv_label_set_text_id(label, WATCH_TEXT_ID_TODAY_STEP);
     lv_obj_set_click(label, false);
 
@@ -271,12 +303,20 @@ lv_obj_t * pedometer_create(lv_obj_t * tileview, uint16_t id)
     lv_obj_set_click(cont_goal, false);
        
     label = lv_label_create(cont_goal, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
        lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font40);
+#else
+       lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26);
+#endif
     lv_label_set_text_id(label, WATCH_TEXT_ID_GOAL_STEP);
     lv_obj_set_click(label, false);
 
        lv_obj_t * btn_goal = lv_btn_create(cont_goal, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
        lv_obj_set_size(btn_goal, 200, 70);
+#else
+       lv_obj_set_size(btn_goal, 150, 56);
+#endif
        lv_obj_set_style_local_bg_color(btn_goal, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_MAKE(0x47, 0xA6, 0xFF));
        lv_obj_set_style_local_radius(btn_goal, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, 30);
        lv_obj_set_style_local_bg_color(btn_goal, LV_BTN_PART_MAIN, LV_STATE_PRESSED, LV_COLOR_MAKE(0x47, 0xA6, 0xFF));
@@ -284,7 +324,11 @@ lv_obj_t * pedometer_create(lv_obj_t * tileview, uint16_t id)
        lv_obj_set_event_cb(btn_goal, mmi_step_goal_btn_event_cb);
        
     label = lv_label_create(btn_goal, NULL);
+#ifdef USE_LV_WATCH_UI_466_466
        lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font40);
+#else
+       lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26);
+#endif
     char str[10] = "";
     snprintf(str, sizeof(str), "%d", pedometer_get_goalsteps());
     lv_label_set_text(label, str);