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 ce6014f..e433d04 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
@@ -866,6 +866,10 @@ const void * lang_text_ch[] = {
     "秒后\n设备将关机", // WATCH_TEXT_ID_NO_SIM_POWER_OFF_PROMPT,
     "充电已连接", // WATCH_TEXT_ID_CHARGE_CONNECTED,
     "充电已移除", // WATCH_TEXT_ID_CHARGE_REMOVED,
+    "禁用时段", // WATCH_TEXT_ID_FORBIDDEN_PERIOD,
+    "设备无网络", // WATCH_TEXT_ID_DEVICE_NO_NETWORK,
+    "设备未绑定", // WATCH_TEXT_ID_DEVICE_NOT_BIND,
+
 
 
     //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 ec6c7b1..5b42b67 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
@@ -866,6 +866,9 @@ const void * lang_text_en[] = {
     "s later\ndevice will shut down", // WATCH_TEXT_ID_NO_SIM_POWER_OFF_PROMPT,
     "Charging connected", // WATCH_TEXT_ID_CHARGE_CONNECTED,
     "Charging removed", // WATCH_TEXT_ID_CHARGE_REMOVED,
+    "Forbidden period", // WATCH_TEXT_ID_FORBIDDEN_PERIOD,
+    "No network", // WATCH_TEXT_ID_DEVICE_NO_NETWORK,
+    "Not bind", // WATCH_TEXT_ID_DEVICE_NOT_BIND,
 
 
     //CHENG_MODIFY

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 63953f1..28192de 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
+++ b/2.sdk/sdk/gui/lv_watch/include/ui_textid.h
@@ -873,6 +873,10 @@ enum
     WATCH_TEXT_ID_NO_SIM_POWER_OFF_PROMPT,              /* "秒后\n设备将关机"           "s later\ndevice will shut down" */
     WATCH_TEXT_ID_CHARGE_CONNECTED,                     /* "充电已连接"                    "Charging connected" */
     WATCH_TEXT_ID_CHARGE_REMOVED,                       /* "充电已移除"                    "Charging removed" */
+    WATCH_TEXT_ID_FORBIDDEN_PERIOD,                     /* "禁用时段"                    "Forbidden period" */
+    WATCH_TEXT_ID_DEVICE_NO_NETWORK,                    /* "设备无网络"                "No network" */
+    WATCH_TEXT_ID_DEVICE_NOT_BIND,                      /* "设备未绑定"                "Not bind" */
+
 
 
     //CHENG_MODIFY

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_ui.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_ui.c
index fa85ccf..c3e4ead 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_ui.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_ui.c
@@ -628,19 +628,18 @@ void wechat_msg_sending_anim_cb(lv_anim_t * a)
 
 void wechat_msg_sending_result_screen_timeout(void *para)
 {
-       lv_wechat_msg_sending_ext_t * sending_ext = (lv_wechat_msg_sending_ext_t *)para;
-
        WECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
-       
-       if(NULL != sending_ext->result_timer_id)
-       {
-               Hal_Timer_Stop(sending_ext->result_timer_id);
-               sending_ext->result_timer_id = NULL;
-       }
+
+       wechat_msg_sending_screen_prepare_destory(NULL);
 
        //delete sending screen
        //lv_watch_del_interface(ACT_ID_WECHAT_SENDING);
-       wechat_msg_sending_screen_prepare_destory(NULL);
+       lv_obj_t * obj = lv_watch_get_activity_obj(ACT_ID_WECHAT_SENDING);
+       if(NULL != obj)
+       {
+               //WECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+               lv_obj_del(obj);
+       }
        
        //return main list screen
        wechat_main_screen_refresh();
@@ -668,41 +667,38 @@ void wechat_msg_sending_screen_timeout(void *para)
                sending_ext->sending_anim.var = NULL;
        }
 
-       sending_ext->result_timer_id = Hal_Timer_Start(1000 * 2, wechat_msg_sending_result_screen_timeout, sending_ext, FALSE);
+       sending_ext->result_timer_id = Hal_Timer_Start(1500, wechat_msg_sending_result_screen_timeout, sending_ext, FALSE);
 }
 
 void wechat_msg_sending_screen_prepare_destory(lv_obj_t * activity_obj)
 {
-       printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+       WECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
        
     lv_watch_png_cache_all_free();
 
        lv_wechat_msg_sending_ext_t * sending_ext = (lv_wechat_msg_sending_ext_t *)wechat_actId_ext_get(ACT_ID_WECHAT_SENDING);
        if(NULL != sending_ext)
        {
+               //WECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
                if(NULL != sending_ext->sending_timer_id)
                {
                        Hal_Timer_Stop(sending_ext->sending_timer_id);
                        sending_ext->sending_timer_id = NULL;
                }
+               //WECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
                if(NULL != sending_ext->result_timer_id)
                {
                        Hal_Timer_Stop(sending_ext->result_timer_id);
                        sending_ext->result_timer_id = NULL;
                }
                
+               //WECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
                if(NULL != sending_ext->sending_anim.var)
                {
                        lv_anim_del(sending_ext->sending_anim.var, NULL);
                        sending_ext->sending_anim.var = NULL;
                }
        }
-
-       lv_obj_t * obj = lv_watch_get_activity_obj(ACT_ID_WECHAT_SENDING);
-       if(NULL != obj)
-       {
-               lv_obj_del(obj);
-       }
 }
 
 lv_obj_t * wechat_msg_sending_screen_create(lv_obj_t * activity_obj)
@@ -727,6 +723,9 @@ lv_obj_t * wechat_msg_sending_screen_create(lv_obj_t * activity_obj)
        lv_wechat_msg_sending_ext_t * sending_ext = (lv_wechat_msg_sending_ext_t *)lv_obj_allocate_ext_attr(obj, sizeof(lv_wechat_msg_sending_ext_t));
        if(NULL == sending_ext)
                return NULL;
+               
+       wechat_chat_list_set_slide_enable(&sending_ext->old_ext, false); /*prevent to slide out while recording*/
+       sending_ext->result_timer_id = NULL;
        sending_ext->send_result = wechat_msg_send_to_server();
        sending_ext->sending_timer_id = Hal_Timer_Start(1000 * 3, wechat_msg_sending_screen_timeout, sending_ext, FALSE);
 
@@ -880,15 +879,12 @@ void wechat_msg_recording_cb(MCI_EVNET_T event , MCI_INFO_T info_type, int32_t v
                return;
        }
        
-       wechat_chat_list_set_slide_enable(&ext->old_ext, false); /*prevent to slide out while recording*/
-       lv_obj_t * activity_obj = NULL;
+       lv_obj_t * activity_obj = lv_watch_get_activity_obj(ACT_ID_WECHAT_RECORDING);
 
        switch(ext->event) 
        {
                case MCI_EVENT_EOS:
-                       wechat_chat_list_set_slide_enable(&ext->old_ext, true); /*reset slide_enable at the end of recording*/
                        //lv_watch_del_interface(ACT_ID_WECHAT_RECORDING);
-                       activity_obj = lv_watch_get_activity_obj(ACT_ID_WECHAT_RECORDING);
                        if(NULL != activity_obj)
                        {
                                lv_obj_del(activity_obj);
@@ -906,7 +902,6 @@ void wechat_msg_recording_cb(MCI_EVNET_T event , MCI_INFO_T info_type, int32_t v
                        Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_5);
                        lv_fs_remove(s_wechat_msg_item_info.msg_data_full_file_name);
                        //lv_watch_del_interface(ACT_ID_WECHAT_RECORDING);
-                       activity_obj = lv_watch_get_activity_obj(ACT_ID_WECHAT_RECORDING);
                        if(NULL != activity_obj)
                        {
                                lv_obj_del(activity_obj);
@@ -953,6 +948,8 @@ void wechat_msg_recording_screen_create(void)
     lv_wechat_msg_recording_ext_t * recording_ext = lv_obj_allocate_ext_attr(obj, sizeof(lv_wechat_msg_recording_ext_t));
        LV_ASSERT_MEM(recording_ext);
 
+       wechat_chat_list_set_slide_enable(&recording_ext->old_ext, false); /*prevent to slide out while recording*/
+       
     lv_obj_t * cont = lv_cont_create(obj, NULL);
     lv_obj_set_size(cont, lv_obj_get_width(obj), lv_obj_get_height(obj));
     lv_obj_align(cont, obj, LV_ALIGN_CENTER, 0, 0);
@@ -1019,7 +1016,7 @@ void wechat_msg_recording_screen_create(void)
                                s_wechat_msg_item_info.msg_time.tm_hour, s_wechat_msg_item_info.msg_time.tm_min, s_wechat_msg_item_info.msg_time.tm_sec);
        
        WECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: msg_from=%d, file_name=%s\n", __FUNCTION__, __LINE__, 
-                               s_wechat_msg_item_info.msg_from, s_wechat_msg_item_info.msg_data_full_file_name);
+                                                       s_wechat_msg_item_info.msg_from, s_wechat_msg_item_info.msg_data_full_file_name);
        
        //recording
        if(AUDIO_CTRL_PRIORITY_5 == Hal_Audio_Manage_Start_Req(AUDIO_CTRL_PRIORITY_5, wechat_msg_recording_audio_ctrl_callback))
@@ -1090,8 +1087,6 @@ void wechat_msg_record_button_event_cb(lv_obj_t * obj, lv_event_t e)
             /*sliding to the right, not click button*/
             return;
         }
-
-        wechat_chat_list_set_slide_enable(&ext->old_ext, false); /*prevent to slide out while recording*/
                
                uint32_t fs_total = 0, fs_free = 0;
                lv_fs_free_space('C', &fs_total, &fs_free);
@@ -1125,8 +1120,6 @@ void wechat_msg_record_button_event_cb(lv_obj_t * obj, lv_event_t e)
                        if(NULL == recording_ext) 
                                return NULL;
 
-            wechat_chat_list_set_slide_enable(&ext->old_ext, true); /*reset slide_enable at the end of recording*/
-
             lv_indev_t * indev = lv_indev_get_act();
             if(indev) 
                        {
@@ -1726,14 +1719,14 @@ void wechat_chat_list_create(lv_obj_t * obj, lv_wechat_ext_t * ext)
        }
 }
 
-void wechat_no_network_create(lv_obj_t * obj)
-{
-    lv_obj_t * img = lv_img_create(obj, NULL);
-    //lv_obj_set_size(img, lv_obj_get_width(obj), lv_obj_get_height(obj));
-    lv_img_set_src(img, ICON_WECHAT_NO_NETWORK);
-    lv_obj_align(img, obj, LV_ALIGN_CENTER, 0, 0);
-    lv_obj_set_click(img, false);
-}
+//void wechat_no_network_create(lv_obj_t * obj)
+//{
+//    lv_obj_t * img = lv_img_create(obj, NULL);
+//    //lv_obj_set_size(img, lv_obj_get_width(obj), lv_obj_get_height(obj));
+//    lv_img_set_src(img, ICON_WECHAT_NO_NETWORK);
+//    lv_obj_align(img, obj, LV_ALIGN_CENTER, 0, 0);
+//    lv_obj_set_click(img, false);
+//}
 
 void wechat_main_screen_refresh(void)
 {
@@ -1745,6 +1738,8 @@ void wechat_main_screen_refresh(void)
        
        WECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
        
+       wechat_chat_list_set_slide_enable(&ext->old_ext, true);
+       
        wechat_msg_voice_item_playing_stop(ext);
        
        wechat_chat_list_msg_item_style_reset(ext);
@@ -1804,13 +1799,6 @@ lv_obj_t * wechat_create(lv_obj_t * activity_obj, lv_wechat_created_from_e from)
        ext->from = from;
        ext->delete_timer_id = NULL;
 
-    if(false == watch_modem_sim_present_check_req())
-               //|| (MMI_MODEM_SIGNAL_BAR_0 == watch_modem_get_signal_bar_req())) 
-    {
-        wechat_no_network_create(obj);
-        return obj;
-    }
-
        lv_obj_t * cont = lv_cont_create(obj, NULL);
        lv_obj_set_size(cont, lv_obj_get_width(obj), lv_obj_get_height(obj));
        lv_obj_align(cont, obj, LV_ALIGN_CENTER, 0, 0);
@@ -1818,6 +1806,33 @@ lv_obj_t * wechat_create(lv_obj_t * activity_obj, lv_wechat_created_from_e from)
        lv_watch_obj_add_element(cont);
        ext->cont = cont;
 
+    if(false == watch_modem_sim_present_check_req()
+               //|| (MMI_MODEM_SIGNAL_BAR_0 == watch_modem_get_signal_bar_req())
+               )
+    {
+               // no network
+               lv_obj_t * label = lv_label_create(cont, NULL);
+               lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26_black);
+               lv_label_set_text_id(label, WATCH_TEXT_ID_DEVICE_NO_NETWORK);
+               lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
+               lv_obj_align(label, cont, LV_ALIGN_CENTER, 0, -10);
+               
+        return obj;
+    }
+    else if(true != mmi_watch_tcp_connect_state_get()
+                       || true != mmi_protocol_watch_bind_state_get()
+                       )
+    {
+               // not bind
+               lv_obj_t * label = lv_label_create(cont, NULL);
+               lv_obj_add_style(label, LV_LABEL_PART_MAIN, &lv_watch_font26_black);
+               lv_label_set_text_id(label, WATCH_TEXT_ID_DEVICE_NOT_BIND);
+               lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
+               lv_obj_align(label, cont, LV_ALIGN_CENTER, 0, -10);
+               
+        return obj;
+    }
+
        //create no msg label
        ext->label_no_msg = lv_label_create(cont, NULL);
        lv_obj_add_style(ext->label_no_msg, LV_LABEL_PART_MAIN, &lv_watch_font26_black);

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 ca7f142..e1add6a 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
@@ -574,7 +574,7 @@ static lv_obj_t * mmi_watch_charging_prompt_screen_create(lv_obj_t * activity_ob
        if(obj == NULL) 
                return NULL;
        
-    lv_watch_obj_set_anim_mode(obj, LV_WATCH_ANIM_HOR_RIGHT_HIDE);
+    //lv_watch_obj_set_anim_mode(obj, LV_WATCH_ANIM_HOR_RIGHT_HIDE);
 
 #if 0
        lv_obj_t * mbox = lv_msgbox_create(obj, NULL);

diff --git a/2.sdk/sdk/gui/lvgl/hal/hal.c b/2.sdk/sdk/gui/lvgl/hal/hal.c
index 1bffd8e..0bac5c2 100644 (file)
--- a/2.sdk/sdk/gui/lvgl/hal/hal.c
+++ b/2.sdk/sdk/gui/lvgl/hal/hal.c
@@ -1792,6 +1792,13 @@ extern void boot_flag_set(uint8_t value) __attribute__((weak));
  */
 VOID Hal_Power_Off(HAL_POWER_OFF_TYPE type)
 {
+#ifdef __MMI_ZHSX_SUPPORT__
+#ifdef __MMI_WECHAT_SUPPORT__
+       wechat_msg_info_nv_write();
+#endif
+       asl_pedometer_steps_save(true);
+#endif
+
     if(type == HAL_TYPE_REBOOT || type == HAL_TYPE_FACTORY_RESET) {
         if(boot_flag_set != NULL) {
             boot_flag_set(SOFT_REBOOT_FLAG);
@@ -1799,17 +1806,8 @@ VOID Hal_Power_Off(HAL_POWER_OFF_TYPE type)
     }
     board_power_off((int)type);
 
-#ifdef __MMI_ZHSX_SUPPORT__
-#ifdef __MMI_WECHAT_SUPPORT__
-       wechat_msg_info_nv_write();
-#endif
-       asl_pedometer_steps_save(true);
-
-#else
     //save steps to nv when power off
-    asl_pedometer_steps_save();
-#endif
-
+    //asl_pedometer_steps_save();
 }
 
 watch_ambient_type_t ambient_flag = AMBIENT_OFF;