gengxin

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 8f6d923..b457f36 100644 (file)
--- 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,11 @@ 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
+    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);
+#endif
     lv_obj_align(content, NULL, LV_ALIGN_CENTER, 0, 0);
     lv_cont_set_layout(content, LV_LAYOUT_COLUMN_MID);
 
@@ -305,6 +309,15 @@ 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
+       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);
+       lv_obj_set_style_local_text_font(roller, LV_ROLLER_PART_BG, LV_STATE_DEFAULT, LV_THEME_WATCH_NIGHT_FONT_26);
+       lv_obj_set_style_local_bg_opa(roller, LV_ROLLER_PART_SELECTED, LV_STATE_DEFAULT, LV_OPA_TRANSP);
+       lv_obj_set_style_local_text_line_space(roller, LV_ROLLER_PART_SELECTED, LV_STATE_DEFAULT, 10);//20);
+       lv_obj_set_style_local_text_font(roller, LV_ROLLER_PART_SELECTED, LV_STATE_DEFAULT, LV_THEME_WATCH_NIGHT_FONT_26);
+#else
     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, 20);
     lv_obj_set_style_local_text_color(roller, LV_ROLLER_PART_BG, LV_STATE_DEFAULT, LV_COLOR_GRAY);
@@ -312,6 +325,7 @@ static lv_obj_t * roller_create(lv_obj_t * par, uint8_t type, uint16_t sel_value
     lv_obj_set_style_local_bg_opa(roller, LV_ROLLER_PART_SELECTED, LV_STATE_DEFAULT, LV_OPA_TRANSP);
     lv_obj_set_style_local_text_line_space(roller, LV_ROLLER_PART_SELECTED, LV_STATE_DEFAULT, 20);
     lv_obj_set_style_local_text_font(roller, LV_ROLLER_PART_SELECTED, LV_STATE_DEFAULT, LV_THEME_WATCH_NIGHT_FONT_26);
+#endif
 
     lv_roller_set_options(roller, roller_opt, LV_ROLLER_MODE_NORMAL);
     lv_roller_set_visible_row_count(roller, 3);

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 741502f..5bbc3d6 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
@@ -16,8 +16,13 @@
  *      DEFINES
  *********************/
 #ifdef __MMI_ZHSX_SUPPORT__
+#ifdef USE_LV_WATCH_UI_240_240_CIRCLE
+#define QRCODE_BG_WIDTH (126+12)
+#define QRCODE_WIDTH (126)
+#else
 #define QRCODE_BG_WIDTH (190+12)
 #define QRCODE_WIDTH (188)
+#endif
 #else
 #define QRCODE_BG_WIDTH 136
 #define QRCODE_WIDTH 126 /*21*n*/
@@ -115,7 +120,11 @@ 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
+       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);
+       #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/status_and_setting/status_and_setting.c b/2.sdk/sdk/gui/lv_watch/lv_apps/status_and_setting/status_and_setting.c
index f00a73d..40f0d35 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
@@ -50,7 +50,11 @@ 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
+    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);
+#endif
 
     lv_obj_t * setting_content = setting_content_create(tab);
     lv_obj_add_style(setting_content, LV_CONT_PART_MAIN, &lv_watch_style_transp);
@@ -305,7 +309,11 @@ 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
+    lv_coord_t width = LV_HOR_RES - 50 - 10;
+#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);
@@ -416,15 +424,25 @@ static void volume_slider_action(lv_obj_t * slider, lv_event_t event)
 
 static void brightness_btn_action(lv_obj_t * obj, lv_event_t event)
 {
-    if(LV_EVENT_CLICKED == event) {
+    if(LV_EVENT_CLICKED == event)
+       {
+       #ifdef USE_LV_WATCH_UI_240_240_CIRCLE
+               slider_create(NULL, SETTING_BRIGHTNESS, 100, brightness_slider_action);
+       #else
         slider_create(NULL, SETTING_BRIGHTNESS, 130, brightness_slider_action);
+       #endif
     }
 }
 
 static void volume_btn_action(lv_obj_t * obj, lv_event_t event)
 {
-    if(LV_EVENT_CLICKED == event) {
+    if(LV_EVENT_CLICKED == event)
+       {
+       #ifdef USE_LV_WATCH_UI_240_240_CIRCLE
+               slider_create(NULL, SETTING_VOLUME, 100, volume_slider_action);
+       #else
         slider_create(NULL, SETTING_VOLUME, 130, volume_slider_action);
+       #endif
     }
 }
 

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 f13c6f6..14fe4af 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
@@ -162,11 +162,18 @@ 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
+       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;
+#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);
     uint8_t item_h = LV_VER_RES*130/360;
     uint8_t item_w = item_h;
     uint8_t item_pad_inner = LV_HOR_RES/24;
+#endif
     lv_obj_set_size(cont, LV_HOR_RES, item_row * (item_h + item_pad_inner) - item_pad_inner);
     lv_cont_set_layout(cont, LV_LAYOUT_PRETTY_TOP);
     lv_obj_set_click(cont, false);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/tool/tool.c b/2.sdk/sdk/gui/lv_watch/lv_apps/tool/tool.c
index a514954..5a33a8d 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/tool/tool.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/tool/tool.c
@@ -12,6 +12,9 @@ static const mmi_watch_list_item_t s_tool_menu_list[] =
        { ICON_TOOL_ALARM, WATCH_TEXT_ID_ALARM, alarm_create_event_cb },
        { ICON_TOOL_STOPWATCH, WATCH_TEXT_ID_STOPWATCH, stopwatch_create_event_cb },
        { ICON_TOOL_TIMER, WATCH_TEXT_ID_TIMER, timer_create_event_cb },
+#ifdef __MMI_WEATHER_MENU_SUPPORT__
+       { ICON_TOOL_WEATHER, WATCH_TEXT_ID_WEATHER, mmi_weather_create_event_cb },
+#endif
 };
 
 lv_obj_t * mmi_tool_menu_create(lv_obj_t * activity_obj)