gengxin

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu.c b/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu.c
index b19e91a..92ac5c8 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu.c
@@ -185,7 +185,7 @@ static lv_obj_t * mmi_main_menu_style_four_grid_display(lv_obj_t * tab, int8_t b
        lv_tileview_add_element(lv_obj_get_parent(tab), btn);
 
        lv_obj_t * label = lv_label_create(cont, NULL);
-       lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font20);
+       lv_obj_add_style(label, LV_LABEL_PART_MAIN, &MMI_MAIN_MENU_FOUR_GRID_STYLE_TEXT_FONT);
        lv_label_set_long_mode(label, LV_LABEL_LONG_DOT);
        lv_obj_set_size(label, 100, 30);
        lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
@@ -257,7 +257,7 @@ static lv_obj_t * mmi_main_menu_style_one_page_display(lv_obj_t * tab, void * bt
        lv_obj_align(btn, cont, LV_ALIGN_CENTER, 0, 0);
 
     lv_obj_t * label = lv_label_create(cont, NULL);
-    lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font30);
+       lv_obj_add_style(label, LV_LABEL_PART_MAIN, &MMI_MAIN_MENU_ONE_PAGE_STYLE_TEXT_FONT);
     lv_label_set_long_mode(label, LV_LABEL_LONG_SROLL_CIRC);
     lv_obj_set_size(label, LV_HOR_RES / 2, 40);
     lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
@@ -287,8 +287,13 @@ static lv_obj_t * mmi_main_menu_style_list_display(lv_obj_t * tab)
     //lv_obj_set_style_local_pad_right(list, LV_LIST_PART_BG, LV_STATE_DEFAULT, 0);
     //lv_obj_set_style_local_pad_inner(list, LV_LIST_PART_BG, LV_STATE_DEFAULT, 0);
     lv_list_set_scrollbar_mode(list, LV_SCROLLBAR_MODE_OFF);
+#ifdef USE_LV_WATCH_UI_466_466
+       lv_obj_set_size(list, lv_obj_get_width(cont) - 120, lv_obj_get_height(cont) - 60);
+       lv_obj_align(list, cont, LV_ALIGN_IN_TOP_LEFT, 90, 30);
+#else // USE_LV_WATCH_UI_240_240
        lv_obj_set_size(list, lv_obj_get_width(cont) - 35 - 10, lv_obj_get_height(cont) - 20);
        lv_obj_align(list, cont, LV_ALIGN_IN_TOP_LEFT, 35, 10);
+#endif
     lv_tileview_add_element(lv_obj_get_parent(tab), list);
     //lv_watch_obj_add_element(lv_page_get_scrl(list));
 
@@ -320,7 +325,11 @@ static lv_obj_t * mmi_main_menu_style_list_display(lv_obj_t * tab)
        #else
                btn = lv_list_add_btn(list, NULL, NULL);
                lv_cont_set_layout(btn, LV_LAYOUT_OFF);
+               #ifdef USE_LV_WATCH_UI_466_466
+               lv_obj_set_size(btn, lv_obj_get_width(list), 105);
+               #else // USE_LV_WATCH_UI_240_240
                lv_obj_set_size(btn, lv_obj_get_width(list), 78);
+               #endif
                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, 0); // 15
@@ -337,9 +346,13 @@ static lv_obj_t * mmi_main_menu_style_list_display(lv_obj_t * tab)
                lv_obj_align(img, btn, LV_ALIGN_IN_LEFT_MID, 0, 0);
                
                label = lv_label_create(btn, NULL);
-               lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26); // &lv_watch_font30);
+               lv_obj_add_style(label, LV_OBJ_PART_MAIN, &MMI_MAIN_MENU_LIST_STYLE_TEXT_FONT);
                lv_label_set_long_mode(label, LV_LABEL_LONG_SROLL);
+               #ifdef USE_LV_WATCH_UI_466_466
+               lv_obj_set_width(label, lv_obj_get_width(btn) - 100);
+               #else // USE_LV_WATCH_UI_240_240
                lv_obj_set_width(label, lv_obj_get_width(btn) - 70);
+               #endif
                lv_label_set_text_id(label, s_main_menu_list[i].txtId);
                lv_obj_align(label, img, LV_ALIGN_OUT_RIGHT_MID, 10, 0);
        #endif

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu.h b/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu.h
index f25967f..5cc91f8 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/primary_menu/primary_menu.h
@@ -117,8 +117,21 @@ MMI_MAIN_MENU_STYLE_E mmi_main_menu_style_get(void);
 void mmi_main_menu_style_set(MMI_MAIN_MENU_STYLE_E style_value);
 
 
+#ifdef __MMI_MAIN_MENU_FOUR_GRID_STYLE__
+
+#define MMI_MAIN_MENU_FOUR_GRID_STYLE_TEXT_FONT        (lv_watch_font20)
+
+#endif
+
+
 #ifdef __MMI_MAIN_MENU_ONE_PAGE_STYLE__
 
+#ifdef USE_LV_WATCH_UI_466_466
+#define MMI_MAIN_MENU_ONE_PAGE_STYLE_TEXT_FONT (lv_watch_font60)
+#else // USE_LV_WATCH_UI_240_240
+#define MMI_MAIN_MENU_ONE_PAGE_STYLE_TEXT_FONT (lv_watch_font30)
+#endif
+
 typedef struct
 {
     watch_app_info_t page_menu_info;
@@ -132,6 +145,18 @@ char * mmi_page_main_menu_tts_info_get(uint8_t menu_index);
 
 #endif
 
+
+#ifdef __MMI_MAIN_MENU_LIST_STYLE__
+
+#ifdef USE_LV_WATCH_UI_466_466
+#define MMI_MAIN_MENU_LIST_STYLE_TEXT_FONT     (lv_watch_font36)
+#else // USE_LV_WATCH_UI_240_240
+#define MMI_MAIN_MENU_LIST_STYLE_TEXT_FONT     (lv_watch_font26)
+#endif
+
+#endif
+
+
 #endif
 
 /**********************