gengxin

diff --git a/2.sdk/new_clean.sh b/2.sdk/new_clean.sh
index 927c53a..faa237d 100644 (file)
--- a/2.sdk/new_clean.sh
+++ b/2.sdk/new_clean.sh
@@ -46,6 +46,7 @@ else
     mv *.zip craneg_modem_watch/
 
     cd craneg_modem_watch/
+    echo "release info" > $file_release.txt
     tar -czvf $file_debug.tar.gz $file_debug.zip "craneg_modem_watch"*.txt "craneg_modem_watch"*.map "craneg_modem_watch"*.elf
     rm $file_debug.zip
     shell $(pwd) #shell $PWD

diff --git a/2.sdk/new_gui.sh b/2.sdk/new_gui.sh
index 2518187..55b2a0a 100644 (file)
--- a/2.sdk/new_gui.sh
+++ b/2.sdk/new_gui.sh
@@ -31,6 +31,7 @@ else
     mv *.zip craneg_modem_watch/
 
     cd craneg_modem_watch/
+    echo "release info" > $file_release.txt
     tar -czvf $file_debug.tar.gz $file_debug.zip "craneg_modem_watch"*.txt "craneg_modem_watch"*.map "craneg_modem_watch"*.elf
     rm $file_debug.zip
     shell $(pwd) #shell $PWD

diff --git a/2.sdk/project/Z5_WL_K7/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_WL_K7/gui/lv_watch/mmi_default_CUSTOM.h
index d25c24e..54c44c1 100644 (file)
--- a/2.sdk/project/Z5_WL_K7/gui/lv_watch/mmi_default_CUSTOM.h
+++ b/2.sdk/project/Z5_WL_K7/gui/lv_watch/mmi_default_CUSTOM.h
@@ -59,7 +59,7 @@
 #define MMI_CUSTOMER_LANGUAGE          (LANG_CH) // LANG_EN
 
 //ring volume
-#define MMI_CUSTOMER_RING_VOLUME               (10)
+#define MMI_CUSTOMER_RING_VOLUME               (2)
 
 //backlight level
 #define MMI_CUSTOMER_BACKLIGHT_LEVEL           (10)
@@ -68,11 +68,7 @@
 #define MMI_CUSTOMER_BACKLIGHT_TIMEOUT         (15) // unit:s
 
 
-//pedometer body info
-#define MMI_CUSTOMER_BODY_HEIGHT               (170)
-
-#define MMI_CUSTOMER_BODY_WEIGHT               (60)
-
+//pedometer
 #define MMI_CUSTOMER_STEP_GOAL         (10000)
 
 // dial pad

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 107101b..21da5d8 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
@@ -200,6 +200,10 @@ static void mmi_gui_timing_task_15_second_mission(void * time_param)
        // pedometer
        mmi_pedometer_steps_mission(cur_time);
 
+       // no sim check
+#ifdef __MMI_ZHSX_SUPPORT_NO_SIM_POWER_OFF__
+       mmi_watch_no_sim_power_off_check_mission();
+#endif
 
 
 

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_about.c b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_about.c
index 925770e..16bd0fe 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_about.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/setting/setting_about.c
@@ -59,7 +59,8 @@ void setting_about_create_btn_action(lv_obj_t * btn, lv_event_t event)
 static lv_obj_t * setting_about_create(lv_obj_t * activity_obj)
 {
 #ifdef __MMI_ZHSX_SUPPORT__
-    char info_str[96 + 1] = {0};
+    //char info_str[96 + 1] = {0};
+    char info_str[128 + 1] = {0};
 
     if(NULL == activity_obj) {
         lv_watch_activity_ext_t activity_ext;
@@ -107,17 +108,28 @@ static lv_obj_t * setting_about_create(lv_obj_t * activity_obj)
 
     lv_obj_t * info_label = lv_label_create(content, NULL);
 #ifdef USE_LV_WATCH_UI_466_466
-    lv_obj_add_style(info_label, LV_LABEL_PART_MAIN, &lv_watch_font40);
+    //lv_obj_add_style(info_label, LV_LABEL_PART_MAIN, &lv_watch_font40);
+       lv_obj_add_style(info_label, LV_LABEL_PART_MAIN, &lv_watch_font36);
     lv_label_set_long_mode(info_label, LV_LABEL_LONG_BREAK);
        lv_obj_set_width(info_label, LV_HOR_RES - 60);
 #else
-    lv_obj_add_style(info_label, LV_LABEL_PART_MAIN, &lv_watch_font26); // &lv_watch_font20);
+    //lv_obj_add_style(info_label, LV_LABEL_PART_MAIN, &lv_watch_font26); // &lv_watch_font20);
+       lv_obj_add_style(info_label, LV_LABEL_PART_MAIN, &lv_watch_font20);
     lv_label_set_long_mode(info_label, LV_LABEL_LONG_BREAK);
        lv_obj_set_width(info_label, LV_HOR_RES - 20);
 #endif
     lv_label_set_align(info_label, LV_LABEL_ALIGN_CENTER);
-       snprintf(info_str, 96, "%s:%s\n%s:%s", (char *)lv_lang_get_text(WATCH_TEXT_ID_MODE), app_adaptor_get_model_id(), 
-                                               (char *)lv_lang_get_text(WATCH_TEXT_ID_VERSION_NUM), app_adaptor_get_version());
+       //snprintf(info_str, 96, "%s:%s\n%s:%s", (char *)lv_lang_get_text(WATCH_TEXT_ID_MODE), app_adaptor_get_model_id(), 
+       //                                      (char *)lv_lang_get_text(WATCH_TEXT_ID_VERSION_NUM), app_adaptor_get_version());
+       
+    char imei_str[16] = {0};
+       app_adp_get_imei_req(imei_str);
+       
+       snprintf(info_str, sizeof(info_str) - 1, "Version:%s\nTime:%s\nIMEI:%s", 
+                                               app_adaptor_get_model_id(),
+                                               app_adaptor_get_version(),
+                                               imei_str
+                                               );
        lv_label_set_text(info_label, info_str);
 #ifdef USE_LV_WATCH_UI_CIRCLE
        #ifdef USE_LV_WATCH_UI_466_466

diff --git a/2.sdk/sdk/gui/lv_watch/lv_watch.c b/2.sdk/sdk/gui/lv_watch/lv_watch.c
index b2c4710..68e807b 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_watch.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_watch.c
@@ -123,9 +123,6 @@ static void mmi_data_init_after_watch_create(void)
 #ifdef __MMI_ZHSX_SUPPORT_ALIPAY__
        mmi_watch_alipay_info_init();
 #endif
-#ifdef __MMI_ZHSX_SUPPORT_NO_SIM_POWER_OFF__
-       mmi_watch_no_sim_power_off_check_mission(); 
-#endif
 #ifdef __MMI_ZHSX_SUPPORT_DO_NOT_DISTURB__
        mmi_watch_do_not_disturb_mission_check();
 #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 77fa408..095f279 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
@@ -2336,6 +2336,7 @@ bool mmi_protocol_fzd_action_get_vc_contact(void)
 bool mmi_protocol_fzd_parse_WATCH_GET_VC_CONFIG(unsigned char * next_buff, unsigned int next_buff_len)
 {
        bool result = false;
+#if 0
        //MMI_PROTOCOL_FZD_ACTION_ENUM action = MMI_FZD_WATCH_GET_VC_CONFIG;
 
        if(NULL == next_buff || 0 == next_buff_len)
@@ -2353,6 +2354,7 @@ bool mmi_protocol_fzd_parse_WATCH_GET_VC_CONFIG(unsigned char * next_buff, unsig
        t_char = next_buff;
        t_id = atoi(t_char);
        PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, t_id);
+#endif
 
        //get contact
        mmi_protocol_fzd_action_get_vc_contact();

diff --git a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c
index fb10d43..c7a2b94 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c
+++ b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_sundry.c
@@ -178,7 +178,7 @@ void mmi_watch_search_timer_stop(void)
 
 void mmi_falldwon_timer_stop(void)
 {
-       if(NULL != s_watch_search_timer_id)
+       if(NULL != s_watch_falldwon_id)
        {
                Hal_Timer_Stop(s_watch_falldwon_id);
                s_watch_falldwon_id = NULL;
@@ -379,7 +379,7 @@ lv_obj_t * mmi_watch_falldwon_create(lv_obj_t * activity_obj)
     }
        Hal_Vibrator_Play_Repeat();
        
-       mmi_watch_search_timer_start();
+       mmi_falldwon_timer_start();
 
        watch_set_suspend_enable(false, ACT_ID_WATCH_FALLDWON, 0);
        
@@ -457,8 +457,12 @@ void mmi_ui_msg_update_watch_server_search(void)
 
 void mmi_ui_msg_update_falldwon(void)
 {
+       if(lv_watch_get_activity_obj(ACT_ID_WATCH_FALLDWON)==NULL)
+       {       
+               
+               mmi_watch_falldwon_create(NULL);
+       }
        
-       mmi_watch_falldwon_create(NULL);
 }
 
 void mmi_watch_searching_aciton(void)
@@ -758,14 +762,20 @@ void mmi_watch_no_sim_power_off_check_action(void)
 
 void mmi_watch_no_sim_power_off_check_mission(void)
 {
-    if((false == watch_modem_sim_present_check_req())
-               && (NULL == lv_watch_get_activity_obj(ACT_ID_FACTORY_MODE_MAIN))
+
+       if(NULL != s_no_sim_power_off_timer) // is exist ?
+               return;
+
+       if(true == watch_modem_sim_present_check_req())
+               return;
+
+       if((NULL != lv_watch_get_activity_obj(ACT_ID_FACTORY_MODE_MAIN))
+               || (NULL != phone_get_activity_obj())
                )
-       {
-               SUNDRY_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+               return;
 
-               mmi_watch_no_sim_power_off_check_action();
-    }
+       SUNDRY_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+       mmi_watch_no_sim_power_off_check_action();
 }
 #endif
 

diff --git a/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_manage.c b/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_manage.c
index 093f269..2ee4043 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_manage.c
+++ b/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_manage.c
@@ -56,6 +56,8 @@ int get_rand_relink_time(void)
 
 void manage_socket_callback(int sfd, int event, unsigned int len)
 {
+       printf("[@CHENG_DEBUG][%s][%d]: event=%d\n", __FUNCTION__, __LINE__, event);
+       
        printf("%s, sfd = %d, event = 0x%x, data len = %d\n",__FUNCTION__, sfd, event, len);
 
        switch (event)

diff --git a/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_net.c b/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_net.c
index 542aa4c..bd4d6ef 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_net.c
+++ b/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_net.c
@@ -20,7 +20,7 @@ void tcp_connect_cb(int t)
 
 #ifdef __MMI_ZHSX_SUPPORT__
 #define MMI_TCP_FIRST_CONNECT_TIME_INTERVAL            (1000 * 5) // ms
-#define MMI_TCP_FIRST_CONNECT_TIMEOUT          (1000 * 60) // ms
+#define MMI_TCP_FIRST_CONNECT_TIMEOUT          (1000 * 60 * 3) // ms
 
 static void * s_tcp_first_connect_timer_id = NULL;
 static uint32_t s_tcp_first_connect_time = 0;