gengxin

diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/setting/ICON_APP_QRCODE.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/setting/ICON_APP_QRCODE.png
new file mode 100644 (file)
index 0000000..546c32b
Binary files /dev/null and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/setting/ICON_APP_QRCODE.png differ

diff --git a/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/setting/icon_seting_app_qrcode.png b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/setting/icon_seting_app_qrcode.png
new file mode 100644 (file)
index 0000000..f56af01
Binary files /dev/null and b/2.sdk/project/Z5_K7/gui/lv_watch/resource/png/setting/icon_seting_app_qrcode.png differ

diff --git a/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index 4837a82..5d520f7 100644 (file)
--- a/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -167,6 +167,7 @@
 
 #define __MMI_HEALTH_MEASURE_TEMPERATURE_SUPPORT__
 
+#define __MMI_APP_QRCODE_MENU_SUPPORT__
 
 
 

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 faf283a..9847ebf 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
@@ -847,6 +847,8 @@ const void * lang_text_ch[] = {
     "℃", // WATCH_TEXT_ID_TEMPERATURE_UNIT
     "App正在寻找此设备\n点击屏幕关闭提醒", // WATCH_TEXT_ID_SERVER_SEARCH_PROMPT
     "设备二维码", // WATCH_TEXT_ID_DEVICE_QRCODE
+    "APP二维码", // WATCH_TEXT_ID_APP_QRCODE,
+    "手机扫码下载APP", // WATCH_TEXT_ID_APP_DOWNLOAD_PROMPT
     "未设置号码", // WATCH_TEXT_ID_NO_NUM
     "手机支付宝扫一扫", // WATCH_TEXT_ID_ZFB_BIND_PROMPT
     "收银员扫一扫完成付款", // WATCH_TEXT_ID_ZFB_PAY_PROMPT
@@ -856,6 +858,8 @@ const void * lang_text_ch[] = {
     "视频呼入中", // WATCH_TEXT_ID_VIDEO_CALL_RINGING,
     "语音呼出中", // WATCH_TEXT_ID_VOICE_CALL_DAILING,
     "语音呼入中", // WATCH_TEXT_ID_VOICE_CALL_RINGING,
+    "通讯录", // WATCH_TEXT_ID_PHONEBOOK,
+    "请在APP设置闹钟", // WATCH_TEXT_ID_NO_ALARM,
 
 
     //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 1afc63b..91c8625 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
@@ -847,6 +847,8 @@ const void * lang_text_en[] = {
     "C", // WATCH_TEXT_ID_TEMPERATURE_UNIT ℃
     "App is looking for this device\ntap the screen to turn off the reminder", // WATCH_TEXT_ID_SERVER_SEARCH_PROMPT
     "Device qrcode", // WATCH_TEXT_ID_DEVICE_QRCODE
+    "APP qrcode", // WATCH_TEXT_ID_APP_QRCODE,
+    "Scan qrcode to download APP", // WATCH_TEXT_ID_APP_DOWNLOAD_PROMPT
     "No number", // WATCH_TEXT_ID_NO_NUM
     "Scan with mobile Alipay", // WATCH_TEXT_ID_ZFB_BIND_PROMPT,
     "Cashier scans to complete payment", // WATCH_TEXT_ID_ZFB_PAY_PROMPT, 
@@ -856,6 +858,8 @@ const void * lang_text_en[] = {
     "Ringing", // WATCH_TEXT_ID_VIDEO_CALL_RINGING, 
     "Dailing", // WATCH_TEXT_ID_VOICE_CALL_DAILING, 
     "Ringing", // WATCH_TEXT_ID_VOICE_CALL_RINGING, 
+    "Phonebook", // WATCH_TEXT_ID_PHONEBOOK,
+    "No alarm", // WATCH_TEXT_ID_NO_ALARM,
 
 
     //CHENG_MODIFY

diff --git a/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm.h b/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm.h
index c323d29..b25547a 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm.h
+++ b/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm.h
@@ -40,6 +40,7 @@ extern "C" {
 #define NV_SECTION_UI_PROTOCOL_DATA_LEN                     (sizeof(nv_watch_protocol_data_t))
 #define NV_SECTION_UI_HEALTH_INFO_LEN               (sizeof(nv_watch_health_info_t))
 #define NV_SECTION_UI_SOS_NUMBER_LEN                (sizeof(nv_watch_sos_number_t))
+#define NV_SECTION_UI_CENTER_NUMBER_LEN                     (sizeof(nv_watch_center_number_t))
 #define NV_SECTION_UI_VC_CONTACT_LEN                   (sizeof(nv_watch_vc_contact_t))
 
 //#endif
@@ -126,6 +127,7 @@ typedef lv_fs_dir_t  ui_dir_t;
 #define NV_SECTION_UI_PROTOCOL_DATA_FILE            "ui_protocol_data.nv"
 #define NV_SECTION_UI_HEALTH_INFO_FILE              "ui_health_info.nv"
 #define NV_SECTION_UI_SOS_NUMBER_FILE               "ui_sos_number.nv"
+#define NV_SECTION_UI_CENTER_NUMBER_FILE                "ui_center_number.nv"
 #define NV_SECTION_UI_VC_CONTACT_FILE                  "ui_vc_contact.nv"
 
 //#endif

diff --git a/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c b/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c
index fac92ed..96d42f9 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c
+++ b/2.sdk/sdk/gui/lv_watch/framework/nvm/ui_nvm_api.c
@@ -83,6 +83,8 @@ uint32_t UI_NV_Get_Section_Len(NV_UI_SECTION_ID SectionId)
                        return (NV_SECTION_LEN(NV_SECTION_UI_HEALTH_INFO));
                case NV_SECTION_UI_SOS_NUMBER:
                        return (NV_SECTION_LEN(NV_SECTION_UI_SOS_NUMBER));
+               case NV_SECTION_UI_CENTER_NUMBER:
+                       return (NV_SECTION_LEN(NV_SECTION_UI_CENTER_NUMBER));
                case NV_SECTION_UI_VC_CONTACT:
                        return (NV_SECTION_LEN(NV_SECTION_UI_VC_CONTACT));
                        
@@ -168,6 +170,8 @@ char * UI_NV_Get_Section_path(NV_UI_SECTION_ID SectionId)
                        return (NV_SECTION_FILE_PATH(NV_SECTION_UI_HEALTH_INFO));
                case NV_SECTION_UI_SOS_NUMBER:
                        return (NV_SECTION_FILE_PATH(NV_SECTION_UI_SOS_NUMBER));
+               case NV_SECTION_UI_CENTER_NUMBER:
+                       return (NV_SECTION_FILE_PATH(NV_SECTION_UI_CENTER_NUMBER));
                case NV_SECTION_UI_VC_CONTACT:
                        return (NV_SECTION_FILE_PATH(NV_SECTION_UI_VC_CONTACT));
                        
@@ -214,6 +218,7 @@ uint8_t UI_NV_Reset_Default(NV_UI_SECTION_ID SectionId)
        nv_watch_protocol_data_t * protocol_data;
        nv_watch_health_info_t * health_info;
        nv_watch_sos_number_t * sos_number;
+       nv_watch_center_number_t * center_number;
        nv_watch_vc_contact_t * vc_contact;
 //#endif
 
@@ -399,6 +404,12 @@ uint8_t UI_NV_Reset_Default(NV_UI_SECTION_ID SectionId)
                        TempData = (char *)sos_number;
                        break;
 
+               case NV_SECTION_UI_CENTER_NUMBER:
+                       center_number = lv_mem_alloc(SectionLen);
+                       memset(center_number, 0x0, SectionLen);
+                       TempData = (char *)center_number;
+                       break;
+
                case NV_SECTION_UI_VC_CONTACT:
                        vc_contact = lv_mem_alloc(SectionLen);
                        memset(vc_contact, 0x0, SectionLen);

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 b03e81e..2999803 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
@@ -188,6 +188,9 @@ enum
        ACT_ID_HEALTH_MEASURE_TEMPERATURE,
 #endif
        ACT_ID_WATCH_SEARCHING,
+#ifdef __MMI_APP_QRCODE_MENU_SUPPORT__
+    ACT_ID_APP_QRCODE, 
+#endif
 
     ACT_ID_MAX,
 };

diff --git a/2.sdk/sdk/gui/lv_watch/include/ui_nvm_interface.h b/2.sdk/sdk/gui/lv_watch/include/ui_nvm_interface.h
index a8a4e8f..3f53364 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/include/ui_nvm_interface.h
+++ b/2.sdk/sdk/gui/lv_watch/include/ui_nvm_interface.h
@@ -213,6 +213,13 @@ typedef struct
        char number[NV_WATCH_SOS_NUMBER_MAX][NV_CONTACTS_MAX_NUMBER_LEN];
 } __packed nv_watch_sos_number_t;
 
+
+typedef struct
+{
+       char number[NV_CONTACTS_MAX_NUMBER_LEN];
+} __packed nv_watch_center_number_t;
+
+
 #define NV_WATCH_VC_CONTACT_TOTAL              (50)
 #define NV_WATCH_VC_CONTACT_NAME_LEN      (16+1)
 #define NV_WATCH_VC_CONTACT_NUMBER_LEN    (20+1)
@@ -408,6 +415,7 @@ enum
        NV_SECTION_UI_PROTOCOL_DATA,                                    // nv_watch_protocol_data_t
        NV_SECTION_UI_HEALTH_INFO,                                              // nv_watch_health_info_t
        NV_SECTION_UI_SOS_NUMBER,                                               // nv_watch_sos_number_t
+       NV_SECTION_UI_CENTER_NUMBER,                                    // nv_watch_center_number_t
        NV_SECTION_UI_VC_CONTACT,                                               // nv_watch_vc_contact_t
 
 //#endif

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 1929aab..21fb5cb 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
+++ b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
@@ -854,6 +854,8 @@ enum
     WATCH_TEXT_ID_TEMPERATURE_UNIT,                     /* "℃"       "℃" */
     WATCH_TEXT_ID_SERVER_SEARCH_PROMPT,                 /* "App正在寻找此设备，点击屏幕关闭提醒"       "App is looking for this device, tap the screen to turn off the reminder" */
     WATCH_TEXT_ID_DEVICE_QRCODE,                        /* "设备二维码"       "Device qrcode" */
+    WATCH_TEXT_ID_APP_QRCODE,                        /* "APP二维码"       "APP qrcode" */
+    WATCH_TEXT_ID_APP_DOWNLOAD_PROMPT,                  /* "手机扫码下载APP"       "Scan qrcode to download APP" */
     WATCH_TEXT_ID_NO_NUM,                               /* "未设置号码"       "No number" */
     WATCH_TEXT_ID_ZFB_BIND_PROMPT,                        /* "手机支付宝扫一扫"       "Scan with mobile Alipay" */
     WATCH_TEXT_ID_ZFB_PAY_PROMPT,                         /* "收银员扫一扫完成付款"       "Cashier scans to complete payment" */
@@ -863,7 +865,8 @@ enum
     WATCH_TEXT_ID_VIDEO_CALL_RINGING,                            /* "视频呼入中"     "Ringing"  */
     WATCH_TEXT_ID_VOICE_CALL_DAILING,                            /* "语音呼出中"     "Dailing"  */
     WATCH_TEXT_ID_VOICE_CALL_RINGING,                            /* "语音呼入中"     "Ringing"  */
-
+    WATCH_TEXT_ID_PHONEBOOK,                            /* "通讯录"             "Phonebook" */
+    WATCH_TEXT_ID_NO_ALARM,                             /* "请在APP设置闹钟"             "No alarm" */
 
     //CHENG_MODIFY
 

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c b/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c
index 1cde69e..4342ec2 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/alarm/alarm_set.c
@@ -107,7 +107,6 @@ lv_obj_t * alarm_list_create(lv_obj_t * activity_obj)
     lv_obj_add_style(title, LV_LABEL_PART_MAIN, &lv_watch_font20_gray);
     lv_obj_align(title, NULL, LV_ALIGN_IN_TOP_MID, 0, 10);
 
-#ifndef __MMI_ZHSX_SUPPORT__
     lv_obj_t * btn_add = lv_btn_create(obj, NULL);
     lv_obj_set_size(btn_add, LV_HOR_RES/5, LV_VER_RES/5);
     lv_obj_t * img_add = lv_img_create(btn_add, NULL);
@@ -119,7 +118,6 @@ lv_obj_t * alarm_list_create(lv_obj_t * activity_obj)
         lv_obj_align(btn_add, NULL, LV_ALIGN_IN_TOP_RIGHT, 0, 0);
     }
     lv_obj_set_event_cb(btn_add, alarm_list_add_btn_action);
-#endif
 
     lv_obj_t * list = lv_list_create(obj, NULL);
     lv_obj_set_size(list, LV_HOR_RES, LV_VER_RES*4/5);
@@ -151,6 +149,7 @@ lv_obj_t * alarm_list_create(lv_obj_t * activity_obj)
                 alarm[i].repeat_bitmap);
     }
 
+       bool t_is_empty = true;
     for(uint8_t i = 0; i < NV_ALARM_MAX_ALARM_NUM; i++) {
         //get min index sorted by time
         int8_t min_index = alarm_list_get_min_index(alarm);
@@ -159,10 +158,31 @@ lv_obj_t * alarm_list_create(lv_obj_t * activity_obj)
             alarm_list_add(list, alarm, min_index);
             //clear min index
             Hal_Mem_Set(&alarm[min_index], 0, sizeof(app_adaptor_alarm_t));
+
+                       // not empty
+                       t_is_empty = false;
         }
     }
     Hal_Mem_Free(alarm);
 
+#ifdef __MMI_ZHSX_SUPPORT__
+       lv_obj_set_hidden(btn_add, true);
+       lv_obj_set_hidden(img_add, true);
+       
+       if(true == t_is_empty)
+       {
+               lv_obj_set_hidden(title, true);
+               lv_obj_set_hidden(list, true);
+               
+           lv_obj_t * label = lv_label_create(obj, NULL);
+           lv_obj_add_style(label, LV_OBJ_PART_MAIN, &lv_watch_font26);
+           lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
+           lv_label_set_text_id(label, WATCH_TEXT_ID_NO_ALARM);
+           lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, 0);
+           lv_obj_set_click(label, false);
+       }
+#endif
+
     return obj;
 }
 

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/alipay/alipay.c b/2.sdk/sdk/gui/lv_watch/lv_apps/alipay/alipay.c
index dd3f2b5..f99dbe6 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/alipay/alipay.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/alipay/alipay.c
@@ -510,6 +510,17 @@ void upay_show_bind_success(lv_obj_t * obj)
 #endif
 
 #if USE_ASR_WATCH_MSG
+void upay_delete_retry_get_bindcode_task_id(void)
+{
+       ALIPAY_DEBUG_PRINTF("[%s][%d]: \n", __FUNCTION__, __LINE__);
+       
+       if(NULL != retry_get_bind_code_task)
+       {
+               lv_task_del(retry_get_bind_code_task);
+               retry_get_bind_code_task = NULL;
+       }
+}
+
 void upay_retry_get_bindcode_task(lv_task_t * task)
 {
     upay_msg_t msg;
@@ -546,6 +557,7 @@ void upay_show_bind_timeout(lv_obj_t * obj)
     printf("upay_show_bind_timeout, show image upay_bind_timeout\n");
     lv_img_set_src(img, ICON_UPAY_BIND_TIMEOUT);
 
+       upay_delete_retry_get_bindcode_task_id();
     retry_get_bind_code_task = lv_task_create(upay_retry_get_bindcode_task, 2000, LV_TASK_PRIO_HIGHEST, (void *)obj);
 }
 #else
@@ -804,6 +816,8 @@ void upay_show_bind_qrcode(lv_obj_t * obj, char *bind_code)
 
        ALIPAY_DEBUG_PRINTF("[%s][%d]: binding_obj=%p,bind_code=%s\n", __FUNCTION__, __LINE__, binding_obj, bind_code);
 
+       upay_delete_retry_get_bindcode_task_id();
+
 #if 1
        lv_obj_t * content = lv_cont_create(binding_obj, NULL);
        lv_cont_set_fit(content, LV_FIT_NONE);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_reset.c b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_reset.c
index 823a480..ed98828 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_reset.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/factory_mode/factory_mode_reset.c
@@ -258,7 +258,7 @@ void mmi_watch_reset(lv_obj_t * activity_obj)
 
        uos_sleep(10);
        
-    mmi_watch_wake_up();    
+    //mmi_watch_wake_up();    
 
     if(NULL == activity_obj) 
        {