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 688d0b6..e7cfbc3 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
@@ -47,7 +47,7 @@ const void * lang_text_ch[] = {
     "锻练",
     "活动记录",
     "支付宝",
-    "短信",
+    "信息",
     /*status_and_setting.c*/
     "年",
     "月",

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 1cd534a..cee03d5 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
@@ -48,7 +48,7 @@ const void * lang_text_en[] = {
     "Exercise",
     "Activity",
     "Alipay",
-    "Sms_msg",
+    "Sms",
     /*status_and_setting.c*/
     "Year",
     "Month",

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 dd88242..52e6b76 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
+++ b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
@@ -49,7 +49,7 @@ enum
     WATCH_TEXT_ID_EXERCISE,                          /* "锻练"                        "Exercise"                        */
     WATCH_TEXT_ID_ACTIVITY,                          /* "活动记录"                    "Activity"                        */
     WATCH_TEXT_ID_ALIPAY,                            /* "支付宝"                     "Alipay"                          */
-    WATCH_TEXT_ID_SMS_MSG,                           /* "短信"                      "sms_msg"*/
+    WATCH_TEXT_ID_SMS_MSG,                           /* "信息"                        "sms"*/
     /*status_and_setting.c*/
     WATCH_TEXT_ID_YEAR,                              /* "年"                          "Year"                            */
     WATCH_TEXT_ID_MONTH,                             /* "月"                          "Month"                           */

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_page_main_menu_tts.c b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_page_main_menu_tts.c
index d551b56..4b5ead6 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_page_main_menu_tts.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_page_main_menu_tts.c
@@ -162,6 +162,11 @@ void mmi_page_main_menu_tts_broadcast(uint8_t index)
                return ;
        }
 
+       if(MMI_MAIN_MENU_STYLE_ONE_PAGE != mmi_main_menu_style_get())
+       {
+               return ;
+       }
+
        if(AUDIO_CTRL_PRIORITY_MENU_TTS == Hal_Audio_Manage_Start_Req(AUDIO_CTRL_PRIORITY_MENU_TTS, mmi_page_main_menu_tts_audio_ctrl_callback))
        {
                printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);