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 3b245ec..a5e9e3c 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
@@ -971,6 +971,7 @@ const void * lang_text_ch[] = {
     "今日步数", // WATCH_TEXT_ID_TODAY_STEP,
     "目标步数", // WATCH_TEXT_ID_GOAL_STEP,
     "我需要你的帮助!", // WATCH_TEXT_ID_SOS_SMS_HELP_CONTENT,
+    "确保设备联网\n点击获取APP二维码", // WATCH_TEXT_ID_APP_QRCODE_REFRESH,
     //CHENG_MODIFY
     "确认是否跌倒?", // WATCH_TEXT_ID_falldown,
     "确认是否删除",

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 a23a345..0c15e80 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
@@ -972,6 +972,7 @@ const void * lang_text_en[] = {
     "Today steps", // WATCH_TEXT_ID_TODAY_STEP,
     "Goal steps", // WATCH_TEXT_ID_GOAL_STEP,
     "I NEED YOUR HELP!", // WATCH_TEXT_ID_SOS_SMS_HELP_CONTENT,
+    "Click to get qrcode", // WATCH_TEXT_ID_APP_QRCODE_REFRESH,
     //CHENG_MODIFY
     "Confirm a fall",
     "Confirm deletion",

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 0e73f6f..1cc034d 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
+++ b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
@@ -979,6 +979,7 @@ enum
     WATCH_TEXT_ID_TODAY_STEP,                           /* "今日步数"                      "Today steps" */
     WATCH_TEXT_ID_GOAL_STEP,                            /* "目标步数"                      "Goal steps" */
     WATCH_TEXT_ID_SOS_SMS_HELP_CONTENT,                 /* "我需要你的帮助!"                      "I NEED YOUR HELP!" */
+    WATCH_TEXT_ID_APP_QRCODE_REFRESH,                   /* "确保设备联网\n点击获取APP二维码"        "Click to get qrcode" */
     //CHENG_MODIFY
     WATCH_TEXT_ID_FALLDWON,                            /*确认是否跌倒*/
     WATCH_TEXT_ID_CONFIRM_DELETE,                        /*确认是否删除*/

diff --git a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c
index c127323..8b7cc2a 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c
+++ b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c
@@ -2157,23 +2157,6 @@ bool mmi_protocol_fzd_action_unbind(void)
        return mmi_protocol_fzd_send_without_data(MMI_FZD_ACTION_UNBIND);
 }
 
-#ifdef __MMI_APP_QRCODE_FROM_SERVER_SUPPORT__
-static uint8_t s_app_qrcode_get_flag = 0;
-
-uint8_t mmi_app_qrcode_get_flag_get(void)
-{
-       return s_app_qrcode_get_flag;
-}
-
-void mmi_app_qrcode_get_flag_set(uint8_t flag)
-{
-       if(0 != flag && 1 != flag)
-               return;
-       
-       s_app_qrcode_get_flag = flag;
-}
-#endif
-
 bool mmi_protocol_fzd_action_get_app_qrcode(void)
 {
 #ifdef __MMI_APP_QRCODE_FROM_SERVER_SUPPORT__
@@ -2205,8 +2188,6 @@ bool mmi_protocol_fzd_parse_ACTION_GET_APP_QRCODE(unsigned char * next_buff, uns
        next_buff_len_new = mmi_protocol_fzd_voice_data_decrypt(next_buff, next_buff_len);
        PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d, %d\n", __FUNCTION__, __LINE__, next_buff_len, next_buff_len_new);
        mmi_app_qrcode_content_buffer_set(next_buff, next_buff_len_new);
-
-       mmi_app_qrcode_get_flag_set(1);
 #endif
 
        return result;