gengxin

diff --git a/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c b/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c
index 817f06a..9f572b0 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c
+++ b/2.sdk/sdk/gui/lv_watch/framework/language/lang_ch.c
@@ -283,6 +283,7 @@ const void * lang_text_ch[] = {
     /*restart_and_reset.c*/
     "重新启动",
     "确定重启设备?",
+    "重启", // WATCH_TEXT_ID_RESTART_SHORT,
 
     /*speech recog.c*/
     "你好,和我聊天吧~",
@@ -891,6 +892,13 @@ const void * lang_text_ch[] = {
     "正在录音", // WATCH_TEXT_ID_AUDIO_RECORDING,
     "正在获取结果", // WATCH_TEXT_ID_GETTING_RESULT,
     "获取失败", // WATCH_TEXT_ID_GET_RESULT_FAIL,
+    "SOS", // WATCH_TEXT_ID_SOS,
+    "电源键", // WATCH_TEXT_ID_KEY_POWER,
+    "返回键", // WATCH_TEXT_ID_KEY_BACK,
+    "2小时", // WATCH_TEXT_ID_2_HOUR,
+    "4小时", // WATCH_TEXT_ID_4_HOUR,
+    "6小时", // WATCH_TEXT_ID_6_HOUR,
+    "8小时", // WATCH_TEXT_ID_8_HOUR,
 
 
     //CHENG_MODIFY

diff --git a/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c b/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c
index dad5b60..5e0a89c 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c
+++ b/2.sdk/sdk/gui/lv_watch/framework/language/lang_en.c
@@ -284,6 +284,7 @@ const void * lang_text_en[] = {
     /*restart_and_reset.c*/
     "Restart",
     "Confirm restart?",
+    "Restart", // WATCH_TEXT_ID_RESTART_SHORT,
 
     /*speech recog.c*/
     "Hello, chat with me",
@@ -892,6 +893,13 @@ const void * lang_text_en[] = {
     "Recording", // WATCH_TEXT_ID_AUDIO_RECORDING,
     "Getting result", // WATCH_TEXT_ID_GETTING_RESULT,
     "Get failed", // WATCH_TEXT_ID_GET_RESULT_FAIL,
+    "SOS", // WATCH_TEXT_ID_SOS,
+    "Key power", // WATCH_TEXT_ID_KEY_POWER,
+    "Key back", // WATCH_TEXT_ID_KEY_BACK,
+    "2 hours", // WATCH_TEXT_ID_2_HOUR,
+    "4 hours", // WATCH_TEXT_ID_4_HOUR,
+    "6 hours", // WATCH_TEXT_ID_6_HOUR,
+    "8 hours", // WATCH_TEXT_ID_8_HOUR,
 
 
     //CHENG_MODIFY

diff --git a/2.sdk/sdk/gui/lv_watch/framework/message/mmi_msg_zhsx.c b/2.sdk/sdk/gui/lv_watch/framework/message/mmi_msg_zhsx.c
index d3a46a0..34c6386 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/framework/message/mmi_msg_zhsx.c
+++ b/2.sdk/sdk/gui/lv_watch/framework/message/mmi_msg_zhsx.c
@@ -76,8 +76,17 @@ void mmi_ui_msg_action_charging_prompt(uint32_t chg_status)
 {
        printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
 
-#ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__
-       if(true == mmi_watch_is_in_do_not_disturb_time())
+       if(true == mmi_active_screen_is_prohibit_interrupted()
+               #ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__
+               || true == mmi_watch_is_in_do_not_disturb_time()
+               #endif
+               )
+       {
+               return ;
+       }
+       
+#ifdef __MMI_WECHAT_SUPPORT__
+       if(true == wechat_screen_is_prohibit_interrupted())
        {
                return;
        }
@@ -88,6 +97,9 @@ void mmi_ui_msg_action_charging_prompt(uint32_t chg_status)
                return;
        }
 
+       if(NULL != lv_watch_get_activity_obj(ACT_ID_WATCH_SEARCHING))
+               return;
+
 #ifdef __MMI_ZHSX_SUPPORT_HEALTH_SENSOR__
        if(true == mmi_health_measure_state_is_ui_measure())
                return;

diff --git a/2.sdk/sdk/gui/lv_watch/include/ui_activity_id.h b/2.sdk/sdk/gui/lv_watch/include/ui_activity_id.h
index a2e3777..6b04ca9 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/include/ui_activity_id.h
+++ b/2.sdk/sdk/gui/lv_watch/include/ui_activity_id.h
@@ -219,6 +219,9 @@ enum
        ACT_ID_AI_TALK_RECORDING,
        ACT_ID_AI_TALK_SENDING,
 #endif
+#ifdef __MMI_KEY_POWER_LONG_PRESS_SCREEN_SUPPORT__
+       ACT_ID_KEY_POWER_LONG_PRESS_SCREEN,
+#endif
 
 
     ACT_ID_MAX,

diff --git a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
index 6acf6a0..a966df8 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
+++ b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
@@ -282,6 +282,7 @@ enum
     /*restart_and_reset.c*/
     WATCH_TEXT_ID_RESTART,                          /* "重新启动"                       "Restart" */
     WATCH_TEXT_ID_RESTART_Q,                        /* "确定重启设备？"                 "Confirm restart?"*/
+    WATCH_TEXT_ID_RESTART_SHORT,                    /* "重启"                       "Restart" */
 
     /*speech recog.c*/
     WATCH_TEXT_ID_HELLO_CHAT,                       /* "你好,和我聊天吧~"               "Hello, chat with me" */
@@ -898,6 +899,13 @@ enum
     WATCH_TEXT_ID_AUDIO_RECORDING,                      /* "正在录音"                 "Recording"*/
     WATCH_TEXT_ID_GETTING_RESULT,                       /* "正在获取结果"             "Getting result"*/
     WATCH_TEXT_ID_GET_RESULT_FAIL,                      /* "获取失败"                "Get failed"*/
+    WATCH_TEXT_ID_SOS,                                  /* "SOS"                         "SOS" */
+    WATCH_TEXT_ID_KEY_POWER,                            /* "电源键"                       "Key power" */
+    WATCH_TEXT_ID_KEY_BACK,                             /* "返回键"                       "Key back" */
+    WATCH_TEXT_ID_2_HOUR,                               /* "2小时"                       "2 hours" */
+    WATCH_TEXT_ID_4_HOUR,                               /* "4小时"                       "4 hours" */
+    WATCH_TEXT_ID_6_HOUR,                               /* "6小时"                       "6 hours" */
+    WATCH_TEXT_ID_8_HOUR,                               /* "8小时"                       "8 hours" */
 
 
     //CHENG_MODIFY