gengxin

diff --git a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.c b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.c
index fd27349..107101b 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.c
+++ b/2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_timing_control.c
@@ -17,7 +17,7 @@ static void * s_timing_control_timer = NULL;
 static int8_t s_timing_control_last_min = -1;
 static uint32_t s_timing_control_timer_counter = 0;
 
-TASK_HANDLE * s_gui_timing_task_id = NULL;
+static TASK_HANDLE * s_gui_timing_task_id = NULL;
 
 static void mmi_gui_timing_timer_callback(uint32_t param);
 static void mmi_gui_timing_task_3_second_mission(void * time_param);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_user_profile/mmi_user_profile.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_user_profile/mmi_user_profile.c
index 863eef8..90cdb79 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_user_profile/mmi_user_profile.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_user_profile/mmi_user_profile.c
@@ -139,7 +139,7 @@ static lv_user_profile_obj_ext_t * mmi_user_profile_get_ext(void)
        if(NULL == watch_obj)
                return NULL;
 
-    lv_vc_call_obj_ext_t * ext = lv_obj_get_ext_attr(watch_obj);
+    lv_user_profile_obj_ext_t * ext = lv_obj_get_ext_attr(watch_obj);
 
     return ext;
 }

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/phonebook/phonebook.c b/2.sdk/sdk/gui/lv_watch/lv_apps/phonebook/phonebook.c
index bcd74e4..63599db 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/phonebook/phonebook.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/phonebook/phonebook.c
@@ -305,11 +305,18 @@ phonebook_contact_t * phonebook_get_contact_info(char * number)
             break;
 
         uint8_t len_nv = strlen(nv_contact_list->info[i].number);
+       #ifdef __MMI_ZHSX_SUPPORT__
+        if(((3 <= len_nv) && (6 >= len_nv) && (len == len_nv)) // short number
+            || ((6 < len_nv) && (len >= len_nv))
+            )
+        {
+       #else
         if(((3 == len_nv)
                 && (len == len_nv))
                 || (((8 == len_nv)
                      || (11 == len_nv))
                     && (len >= len_nv))) {
+       #endif
             if(0 == strcmp(&number[len - len_nv], nv_contact_list->info[i].number)) {
                 contact = (phonebook_contact_t *)lv_mem_alloc(sizeof(phonebook_contact_t));
                 memcpy(contact->contact_name, nv_contact_list->info[i].name, PHONEBOOK_CONTACTS_MAX_NAME_LEN);

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 a514aa5..bb71d68 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
@@ -1208,104 +1208,6 @@ bool mmi_protocol_fzd_parse_SERVER_SET_TEMPERATURE_INTERVAL(unsigned char * next
        return result;
 }
 
-static TIMER_ID t=NULL;
-static void alarm_timeout(void * para)
-{
-       mmi_protocol_fzd_action_HEARTBEAT();
-}
-
-bool mmi_protocol_fzd_parse_SERVER_SET_STFREQ(unsigned char * next_buff, unsigned int next_buff_len)
-{
-       bool result = false;
-       MMI_PROTOCOL_FZD_ACTION_ENUM action = MMI_FZD_ACTION_SET_STFREQ;
-
-       if(NULL == next_buff || 0 == next_buff_len)
-       {
-               PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
-               return false;
-       }
-
-       result = true;
-       mmi_protocol_fzd_send_without_data(action);
-       int off= atoi(strtok(next_buff,","));
-
-       int value_interval = atoi(strtok(NULL,"\0"));
-       printf("MMI_FZD_ACTION_SET_STFREQ %d,%d",off,value_interval);
-       if(t==NULL)
-       {
-               if(off!=0)
-               {       
-                       t= Hal_Timer_Start(value_interval *1000*60, alarm_timeout, NULL,1);
-               }
-               else
-               {
-                       Hal_Timer_Stop(t);
-               }
-               
-       }
-       else
-       {
-               if(off!=0)
-               {
-                       Hal_Timer_Stop(t);
-                       t= Hal_Timer_Start(value_interval *1000*60, alarm_timeout, NULL,1);
-               }
-               else
-               {
-                       Hal_Timer_Stop(t);
-               }
-               
-
-       }
-       
-       
-       return result;
-}
-
-bool mmi_protocol_fzd_parse_SERVER_SET_SET_PEDO(unsigned char * next_buff, unsigned int next_buff_len)
-{
-       bool result = false;
-       MMI_PROTOCOL_FZD_ACTION_ENUM action = MMI_FZD_ACTION_SET_PEDO;
-
-       if(NULL == next_buff || 0 == next_buff_len)
-       {
-               PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
-               return false;
-       }
-
-       mmi_protocol_fzd_send_without_data(action);
-       int off= atoi(next_buff);
-       if(off==0)
-       {
-               if(t!=NULL)
-               {
-                       Hal_Timer_Stop(t);
-               }
-               else
-               {
-                       t= Hal_Timer_Start(5 *1000*60, alarm_timeout, NULL,1);
-               }
-               
-       }
-       
-       return result;
-}
-
-bool mmi_protocol_fzd_parse_SERVER_SET_SLEEP_SW(unsigned char * next_buff, unsigned int next_buff_len)
-{
-       bool result = false;
-       MMI_PROTOCOL_FZD_ACTION_ENUM action = MMI_FZD_ACTION_SET_SLEEP_SW;
-
-       if(NULL == next_buff || 0 == next_buff_len)
-       {
-               PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
-               return false;
-       }
-
-       
-       return result;
-}
-
 bool mmi_protocol_fzd_parse_SERVER_SET_BLOOD_INTERVAL(unsigned char * next_buff, unsigned int next_buff_len)
 {
        bool result = false;

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 09a4bc0..cd53033 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
@@ -119,9 +119,6 @@ typedef enum
        MMI_FZD_ACTION_SEND_BLOOD,
        MMI_FZD_SERVER_SET_SPO2_INTERVAL,
        MMI_FZD_ACTION_SEND_SPO2,
-       MMI_FZD_ACTION_SET_STFREQ,
-       MMI_FZD_ACTION_SET_PEDO,
-       MMI_FZD_ACTION_SET_SLEEP_SW,
 #endif
 
 #ifdef __MMI_WECHAT_SUPPORT__

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 7e3c9b5..6c5ca6b 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
@@ -43,9 +43,6 @@ static unsigned char * mmi_protocol_fzd_action_string_get(MMI_PROTOCOL_FZD_ACTIO
                        {MMI_FZD_ACTION_SEND_BLOOD, "blood"},
                        {MMI_FZD_SERVER_SET_SPO2_INTERVAL, "oxstart"},
                        {MMI_FZD_ACTION_SEND_SPO2, "oxygen"},
-                       {MMI_FZD_ACTION_SET_STFREQ, "STFreq"},
-                       {MMI_FZD_ACTION_SET_PEDO, "PEDO"},
-                       {MMI_FZD_ACTION_SET_SLEEP_SW, "SLEEP_SW"},
                #endif
                        
                #ifdef __MMI_WECHAT_SUPPORT__
@@ -277,15 +274,6 @@ static bool mmi_protocol_fzd_content_parse(unsigned char * content_ptr, unsigned
                        
                case MMI_FZD_ACTION_SEND_SPO2:
                        break;
-               case MMI_FZD_ACTION_SET_STFREQ:
-                       mmi_protocol_fzd_parse_SERVER_SET_STFREQ(next_buff, next_buff_len);
-                       break;
-               case MMI_FZD_ACTION_SET_PEDO:
-                       mmi_protocol_fzd_parse_SERVER_SET_SET_PEDO(next_buff, next_buff_len);
-                       break;
-               case MMI_FZD_ACTION_SET_SLEEP_SW:
-                       mmi_protocol_fzd_parse_SERVER_SET_SLEEP_SW(next_buff, next_buff_len);
-                       break;
        #endif
                        
        #ifdef __MMI_WECHAT_SUPPORT__