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 0382aaf..688d0b6 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
@@ -909,6 +909,11 @@ const void * lang_text_ch[] = {
     "未佩戴", // WATCH_TEXT_ID_NO_WEAR,
     "漏光测试", // WATCH_TEXT_ID_LIGHT_LEAK_TEST,
     "漏光数据", // WATCH_TEXT_ID_LIGHT_LEAK_DATA,
+    "久坐提醒", // WATCH_TEXT_ID_SEDENTARY_REMIND,
+    "提醒时间（分）", // WATCH_TEXT_ID_REMIND_TIME_MINUTE,
+    "您坐太久了", // WATCH_TEXT_ID_SEDENTARY_PROMPT,
+    "大图标播报", // WATCH_TEXT_ID_PAGE_MAIN_MENU_TTS,
+    "新信息静音", // WATCH_TEXT_ID_NEW_SMS_SILENT,
 
 
     //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 a5fae41..1cd534a 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
@@ -910,6 +910,11 @@ const void * lang_text_en[] = {
     "not wear", // WATCH_TEXT_ID_NO_WEAR,
     "light leak", // WATCH_TEXT_ID_LIGHT_LEAK_TEST,
     "light leak data", // WATCH_TEXT_ID_LIGHT_LEAK_DATA,
+    "Sedentary remind", // WATCH_TEXT_ID_SEDENTARY_REMIND,
+    "Remind time(min)", // WATCH_TEXT_ID_REMIND_TIME_MINUTE,
+    "Sitting too long", // WATCH_TEXT_ID_SEDENTARY_PROMPT,
+    "Big icon tts", // WATCH_TEXT_ID_PAGE_MAIN_MENU_TTS,
+    "SMS silent", // WATCH_TEXT_ID_NEW_SMS_SILENT,
 
 
     //CHENG_MODIFY

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 6b04ca9..e9cbd23 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
@@ -171,6 +171,8 @@ enum
 #endif
 
        ACT_ID_WATCH_COMMON,
+       ACT_ID_WATCH_SETTING_COMMON,
+       ACT_ID_WATCH_FACTORY_RESET,
 #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__
        ACT_ID_VC_DIAL_BTN,
 #endif
@@ -201,9 +203,6 @@ enum
 #ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__
        ACT_ID_DO_NOT_DISTURB, 
 #endif
-#ifdef __MMI_MAIN_MENU_SWITCH_MENU__
-       ACT_ID_SETTING_MAIN_MENU_SWITCH,
-#endif
 #ifdef __MMI_TOOL_MENU_SUPPORT__
        ACT_ID_TOOL_MENU,
 #endif
@@ -222,6 +221,9 @@ enum
 #ifdef __MMI_KEY_POWER_LONG_PRESS_SCREEN_SUPPORT__
        ACT_ID_KEY_POWER_LONG_PRESS_SCREEN,
 #endif
+#ifdef __MMI_PHONEBOOK_CALLLOG_IN_ONE_MENU__
+       ACT_ID_PHONEBOOK_CALLLOG,
+#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 58f0b1c..dd88242 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
+++ b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
@@ -916,6 +916,11 @@ enum
     WATCH_TEXT_ID_NO_WEAR,                              /* "未佩戴"                       "not wear" */
     WATCH_TEXT_ID_LIGHT_LEAK_TEST,                      /* "漏光测试"                     "light leak" */
     WATCH_TEXT_ID_LIGHT_LEAK_DATA,                      /* "漏光数据"                     "light leak data" */
+    WATCH_TEXT_ID_SEDENTARY_REMIND,                     /* "久坐提醒"                     "Sedentary remind" */
+    WATCH_TEXT_ID_REMIND_TIME_MINUTE,                   /* "提醒时间（分）"                "Remind time(min)" */
+    WATCH_TEXT_ID_SEDENTARY_PROMPT,                     /* "您坐太久了"                    "Sitting too long" */
+    WATCH_TEXT_ID_PAGE_MAIN_MENU_TTS,                   /* "大图标播报"                    "Big icon tts" */
+    WATCH_TEXT_ID_NEW_SMS_SILENT,                       /* "新信息静音"                    "SMS silent" */
 
 
     //CHENG_MODIFY