youhua

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_remind/mmi_remind.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_remind/mmi_remind.c
index afb7676..73843aa 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_remind/mmi_remind.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_remind/mmi_remind.c
@@ -1085,6 +1085,13 @@ void mmi_remind_screen_active(void)
                return;
        }
 
+#ifdef __MMI_SLEEP_FUNCTION_SUPPORT__
+       if(true == mmi_watch_time_is_in_sleep_time())
+       {
+               return;
+       }
+#endif
+
     if(true == mmi_remind_screen_is_active())
        {
         return;

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 91b9e79..68145fb 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
@@ -93,7 +93,7 @@ void primary_menu_init(void)
        MMI_MAIN_MENU_STYLE_E style_value = MMI_MAIN_MENU_STYLE_MAX;
        
     watch_menu_app_cnt = 0;
-       mmi_main_menu_style_nv_read();
+       //mmi_main_menu_style_nv_read();
        
        style_value = mmi_main_menu_style_get();
        printf("[@CHENG_DEBUG][%s][%d]: style_value=%d\n", __FUNCTION__, __LINE__, style_value);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_main_menu_switch.c b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_main_menu_switch.c
index 7473ad5..5b594f3 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_main_menu_switch.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_main_menu_switch.c
@@ -56,8 +56,8 @@ static void setting_main_menu_switch_event_cb(lv_obj_t * obj, lv_event_t event)
        
        if(true == is_change_style)
        {
-               lv_watch_obj_cleanup(obj);
-               setting_main_menu_switch_prepare_destory(NULL);
+       //      lv_watch_obj_cleanup(obj);
+       //      setting_main_menu_switch_prepare_destory(NULL);
                printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
                lv_watch_go_home();
                launcher_recreate();

diff --git a/2.sdk/sdk/gui/lv_watch/lv_watch.c b/2.sdk/sdk/gui/lv_watch/lv_watch.c
index 77394d0..8be863a 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_watch.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_watch.c
@@ -102,6 +102,7 @@ static void mmi_data_init_before_watch_create(void)
 #ifdef __MMI_USER_PROFILE_SUPPORT__
        mmi_watch_user_profile_nv_read();
 #endif
+       mmi_main_menu_style_nv_read();
 
 #ifdef __MMI_CUSTOM_HENGAI_HEALTH__
        mmi_hengai_health_data_nv_read();