gengxin

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c b/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c
index 79827f8..5bd62ce 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/sms_msg/sms_msg.c
@@ -1002,6 +1002,10 @@ static void  del_msg_sure_btn_cb(lv_obj_t * btn,lv_event_t e)
        }
 }
 
+static void mmi_sms_vib_prompt_task_cb(lv_task_t * task)
+{
+       Hal_Vibrator_Play_End();
+}
 
 void sms_msg_list_update(void)
 {
@@ -1021,9 +1025,12 @@ void sms_msg_list_update(void)
 #endif
        Hal_NFFS_File_Play_Onetime(AUDIO_SETTING_AUDIO_MSG, volume, NULL, 0);
 
+       Hal_Vibrator_Play_End();
        if(true == mmi_watch_vibrate_is_permitted())
        {
                Hal_Vibrator_Play_Onetime(NULL, 800);
+               lv_task_t * task_ptr = lv_task_create(mmi_sms_vib_prompt_task_cb, 900, LV_TASK_PRIO_MID, NULL);
+               lv_task_once(task_ptr);
        }
 #endif
        

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 e9ad9e0..9405cfb 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
@@ -601,6 +601,8 @@ bool mmi_protocol_fzd_parse_LINK(unsigned char * next_buff, unsigned int next_bu
        mmi_protocol_fzd_action_send_telecom_info_pre();
 #endif
 
+       mmi_protocol_fzd_action_send_iccid();
+
        return true;
 }
 
@@ -4135,6 +4137,27 @@ bool mmi_protocol_fzd_action_send_telecom_info(void)
 
 #endif
 
+bool mmi_protocol_fzd_action_send_iccid(void)
+{
+       bool result = false;
+       MMI_PROTOCOL_FZD_ACTION_ENUM action = MMI_FZD_ACTION_SEND_ICCID;
+       unsigned char content_buff[64] = {0};
+       unsigned int content_lenth = 0;
+
+       // iccid
+       char * p_iccid = app_adaptor_get_iccid_info_req();
+       sprintf(content_buff, ",%s", p_iccid);
+    lv_mem_free(p_iccid);
+       
+       //PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %s\n", __FUNCTION__, __LINE__, content_buff);
+       
+       content_lenth = strlen(content_buff);
+       result = mmi_protocol_fzd_send_with_data(action, content_buff, content_lenth);
+       
+       return result;
+}
+
+
 #endif
 
 

diff --git a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.h b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.h
index 98acec8..b40eeaf 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.h
+++ b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.h
@@ -210,6 +210,7 @@ MMI_FZD_ACTION_HENGAI_SLEEP_DATA_TEST,
 #ifdef MMI_PROJECT_C55_DS_D11G_DT_HZCH
        MMI_FZD_ACTION_SEND_TELECOM_INFO,
 #endif
+       MMI_FZD_ACTION_SEND_ICCID,
        MMI_FZD_SERVER_SET_BOOTOFF,
        MMI_FZD_SEND_UP_REMIND,
 
@@ -380,6 +381,7 @@ bool mmi_protocol_fzd_action_hengai_sleep_data(char * file_buf, uint32_t file_si
 bool mmi_protocol_fzd_action_send_telecom_info(void);
 bool mmi_protocol_fzd_action_send_telecom_info_pre(void);
 #endif
+bool mmi_protocol_fzd_action_send_iccid(void);
 
 
 #endif

diff --git a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd_content.c b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd_content.c
index c055b67..f4600c0 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd_content.c
+++ b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd_content.c
@@ -143,6 +143,7 @@ static unsigned char * mmi_protocol_fzd_action_string_get(MMI_PROTOCOL_FZD_ACTIO
                #ifdef MMI_PROJECT_C55_DS_D11G_DT_HZCH
                        {MMI_FZD_ACTION_SEND_TELECOM_INFO, "TELECOM_INFO"},
                #endif
+                       {MMI_FZD_ACTION_SEND_ICCID, "BIND_ICCID"},
                        {MMI_FZD_SERVER_SET_BOOTOFF, "BOOTOFF"},
                        {MMI_FZD_SEND_UP_REMIND, "UP_REMIND"},
                
@@ -492,6 +493,9 @@ static bool mmi_protocol_fzd_content_parse(unsigned char * content_ptr, unsigned
                        break;
        #endif
 
+               case MMI_FZD_ACTION_SEND_ICCID:
+                       break;
+
                case MMI_FZD_SERVER_SET_BOOTOFF:
                        mmi_protocol_fzd_parse_SERVER_SET_BOOTOFF(next_buff, next_buff_len);
                        break;

diff --git a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.h b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.h
index 15da5cd..32dce8f 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.h
+++ b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.h
@@ -118,8 +118,8 @@ void mmi_watch_sim_unbind_check(void);
 
 void __create_event_cb(lv_obj_t * btn, lv_event_t event);
 #else
-#define MMI_CHIP_TEMP_HIGH_THRESHOLD (40) // (65) // (90)
-#define MMI_CHIP_TEMP_LOW_THRESHOLD    (35) // (55) // (30)
+#define MMI_CHIP_TEMP_HIGH_THRESHOLD (70) // (65) // (90)
+#define MMI_CHIP_TEMP_LOW_THRESHOLD    (60) // (55) // (30)
 #endif
 
 bool mmi_is_ACT_ID_CHIP_TEMP_HIGH(void);