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 97a491f..ce6014f 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
@@ -864,6 +864,8 @@ const void * lang_text_ch[] = {
     "血氧测试", // WATCH_TEXT_ID_SPO2_TEST,
     "体温测试", // WATCH_TEXT_ID_TEMPERATURE_TEST,
     "秒后\n设备将关机", // WATCH_TEXT_ID_NO_SIM_POWER_OFF_PROMPT,
+    "充电已连接", // WATCH_TEXT_ID_CHARGE_CONNECTED,
+    "充电已移除", // WATCH_TEXT_ID_CHARGE_REMOVED,
 
 
     //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 d9e6feb..ec6c7b1 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
@@ -864,6 +864,8 @@ const void * lang_text_en[] = {
     "Spo2 test", // WATCH_TEXT_ID_SPO2_TEST,
     "Temperatur test", // WATCH_TEXT_ID_TEMPERATURE_TEST,
     "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,
 
 
     //CHENG_MODIFY

diff --git a/2.sdk/sdk/gui/lv_watch/framework/message/mmi_msg_zhsx.c b/2.sdk/sdk/gui/lv_watch/framework/message/mmi_msg_zhsx.c
index 699e8ea..7651220 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/framework/message/mmi_msg_zhsx.c
+++ b/2.sdk/sdk/gui/lv_watch/framework/message/mmi_msg_zhsx.c
@@ -32,18 +32,10 @@ void mmi_ui_msg_action_watch_searching(void)
        mmi_ui_msg_action_no_para_msg(MMI_MSG_WATCH_SEARCHING);
 }
 
-
 #ifdef __MMI_WECHAT_SUPPORT__
 void mmi_ui_msg_action_wechat_incoming(void)
 {
-       printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
-       
-       mmi_msg_wechat_incoming_t * msg_info = (mmi_msg_wechat_incoming_t *)Hal_Mem_Alloc(sizeof(mmi_msg_wechat_incoming_t));
-
-       memset(msg_info, 0x0, sizeof(mmi_msg_wechat_incoming_t));
-       msg_info->header.MsgId = MMI_MSG_WECHAT_INCOMING;
-
-       Hal_Send_Message((TASK_ID)gui_task_id, (void *)msg_info);
+       mmi_ui_msg_action_no_para_msg(MMI_MSG_WECHAT_INCOMING);
 }
 #endif
 
@@ -61,6 +53,11 @@ void mmi_ui_msg_action_vc_call_incoming(void)
 
        Hal_Send_Message((TASK_ID)gui_task_id, (void *)msg_info);
 }
+
+void mmi_ui_msg_action_vc_call_stop(void)
+{
+       mmi_ui_msg_action_no_para_msg(MMI_MSG_VC_CALL_STOP);
+}
 #endif
 
 void mmi_ui_msg_action_center_number_dialing(void)
@@ -68,6 +65,26 @@ void mmi_ui_msg_action_center_number_dialing(void)
        mmi_ui_msg_action_no_para_msg(MMI_MSG_CENTER_NUMBER_DIALING);
 }
 
+#ifdef __MMI_ZHSX_SUPPORT_NO_SIM_POWER_OFF__
+void mmi_ui_msg_action_no_sim_power_off(void)
+{
+       mmi_ui_msg_action_no_para_msg(MMI_MSG_NO_SIM_POWER_OFF);
+}
+#endif
+
+void mmi_ui_msg_action_charging_prompt(uint32_t chg_status)
+{
+       printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+       
+       mmi_msg_charging_prompt_t * msg_info = (mmi_msg_charging_prompt_t *)Hal_Mem_Alloc(sizeof(mmi_msg_charging_prompt_t));
+
+       memset(msg_info, 0x0, sizeof(mmi_msg_charging_prompt_t));
+       msg_info->header.MsgId = MMI_MSG_CHARGING_PROMPT;
+       msg_info->chg_status = chg_status;
+
+       Hal_Send_Message((TASK_ID)gui_task_id, (void *)msg_info);
+}
+
 
 
 #if 0

diff --git a/2.sdk/sdk/gui/lv_watch/framework/message/mmi_msg_zhsx.h b/2.sdk/sdk/gui/lv_watch/framework/message/mmi_msg_zhsx.h
index 843546b..a11dc65 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/framework/message/mmi_msg_zhsx.h
+++ b/2.sdk/sdk/gui/lv_watch/framework/message/mmi_msg_zhsx.h
@@ -26,8 +26,13 @@ void mmi_ui_msg_action_wechat_incoming(void);
 #endif
 #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__
 void mmi_ui_msg_action_vc_call_incoming(void);
+void mmi_ui_msg_action_vc_call_stop(void);
 #endif
 void mmi_ui_msg_action_center_number_dialing(void);
+#ifdef __MMI_ZHSX_SUPPORT_NO_SIM_POWER_OFF__
+void mmi_ui_msg_action_no_sim_power_off(void);
+#endif
+void mmi_ui_msg_action_charging_prompt(uint32_t chg_status);
 
 
 

diff --git a/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.c b/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.c
index e0caa8a..c90b087 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.c
+++ b/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.c
@@ -391,6 +391,10 @@ void watch_ui_message_handle(uint16_t msgid, void * msg)
                        //printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
                        mmi_ui_msg_update_vc_call_incoming();
                        break;
+
+               case MMI_MSG_VC_CALL_STOP:
+                       mmi_ui_msg_update_vc_call_stop();
+                       break;
        #endif
 
                case MMI_MSG_CENTER_NUMBER_DIALING:
@@ -398,6 +402,17 @@ void watch_ui_message_handle(uint16_t msgid, void * msg)
                        mmi_ui_msg_update_ceter_number_dialing();
                        break;
 
+       #ifdef __MMI_ZHSX_SUPPORT_NO_SIM_POWER_OFF__
+               case MMI_MSG_NO_SIM_POWER_OFF:
+                       mmi_ui_msg_update_no_sim_power_off();
+                       break;
+       #endif
+
+               case MMI_MSG_CHARGING_PROMPT:
+                       mmi_ui_msg_update_charging_prompt(((mmi_msg_charging_prompt_t *)msg)->chg_status);
+                       break;
+                       
+
                        
        #endif
        

diff --git a/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.h b/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.h
index 1b6a28b..533293f 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.h
+++ b/2.sdk/sdk/gui/lv_watch/framework/message/watch_msg_handle.h
@@ -108,8 +108,14 @@ enum
 #endif
 #ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__
        MMI_MSG_VC_CALL_INCOMING,
+       MMI_MSG_VC_CALL_STOP,
 #endif
        MMI_MSG_CENTER_NUMBER_DIALING,
+#ifdef __MMI_ZHSX_SUPPORT_NO_SIM_POWER_OFF__
+       MMI_MSG_NO_SIM_POWER_OFF,
+#endif
+       MMI_MSG_CHARGING_PROMPT,
+       
        
 #endif
 };
@@ -513,25 +519,27 @@ typedef struct
 #endif
 
 
+
 #ifdef __MMI_ZHSX_SUPPORT__
 typedef struct
 {
     UI_Inter_Msg_Header_t header;
 } mmi_msg_no_para_t;
 
-#ifdef __MMI_WECHAT_SUPPORT__
+#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__
 typedef struct
 {
-       UI_Inter_Msg_Header_t header;
-} mmi_msg_wechat_incoming_t;
+    UI_Inter_Msg_Header_t header;
+} mmi_msg_vc_incoming_t;
 #endif
 
-#ifdef __MMI_ZHSX_SUPPORT_VIDEO_CALL__
 typedef struct
 {
     UI_Inter_Msg_Header_t header;
-} mmi_msg_vc_incoming_t;
-#endif
+       uint32_t chg_status;
+} mmi_msg_charging_prompt_t;
+
+
 
 #endif
 

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 2999803..587e362 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
@@ -191,6 +191,11 @@ enum
 #ifdef __MMI_APP_QRCODE_MENU_SUPPORT__
     ACT_ID_APP_QRCODE, 
 #endif
+#ifdef __MMI_ZHSX_SUPPORT_NO_SIM_POWER_OFF__
+       ACT_ID_NO_SIM_POWER_OFF_PROMPT, 
+#endif
+    ACT_ID_CHARGING_PROMPT,
+
 
     ACT_ID_MAX,
 };