xiugai

diff --git a/2.sdk/CC_0526.doc b/2.sdk/CC_0526.doc
index 5777d67..6cfa6c9 100644 (file)
Binary files a/2.sdk/CC_0526.doc and b/2.sdk/CC_0526.doc differ

diff --git a/2.sdk/gui/lv_watch/lv_apps/health_measure/health_measure.c b/2.sdk/gui/lv_watch/lv_apps/health_measure/health_measure.c
index bc04268..ff0dc9b 100644 (file)
--- a/2.sdk/gui/lv_watch/lv_apps/health_measure/health_measure.c
+++ b/2.sdk/gui/lv_watch/lv_apps/health_measure/health_measure.c
@@ -100,6 +100,14 @@ MMI_HEALTH_MEASURE_STATE_E mmi_health_measure_state_get(void)
        return s_health_measure_run_data.measure_state;
 }
 
+bool mmi_health_measure_state_is_ui_measure(void)
+{
+       if(MMI_HEALTH_MEASURE_STATE_UI == s_health_measure_run_data.measure_state)
+               return true;
+
+       return false;
+}
+
 bool mmi_health_measure_heart_data_process(uint16_t * heart_value)
 {
        uint16_t t_value = 0;

diff --git a/2.sdk/gui/lv_watch/lv_apps/health_measure/health_measure.h b/2.sdk/gui/lv_watch/lv_apps/health_measure/health_measure.h
index c5a33b2..3119625 100644 (file)
--- a/2.sdk/gui/lv_watch/lv_apps/health_measure/health_measure.h
+++ b/2.sdk/gui/lv_watch/lv_apps/health_measure/health_measure.h
@@ -69,6 +69,7 @@ typedef struct
 
 bool mmi_health_measure_wear_state_get(void);
 MMI_HEALTH_MEASURE_STATE_E mmi_health_measure_state_get(void);
+bool mmi_health_measure_state_is_ui_measure(void);
 
 bool mmi_health_measure_heart_data_ui_get(uint16_t * heart_value);
 bool mmi_health_measure_temperature_data_ui_get(float * body_value, float * wrist_value);

diff --git a/2.sdk/gui/lv_watch/lv_apps/wechat/wechat_ui.c b/2.sdk/gui/lv_watch/lv_apps/wechat/wechat_ui.c
index 0ac3702..fdf336f 100644 (file)
--- a/2.sdk/gui/lv_watch/lv_apps/wechat/wechat_ui.c
+++ b/2.sdk/gui/lv_watch/lv_apps/wechat/wechat_ui.c
@@ -335,6 +335,7 @@ bool wechat_msg_receive_from_server(char * data_buff, int data_buff_len, nv_wech
        wechat_msg_info_new_item_add(&wechat_msg_item_info);
 
        if(false == mmi_active_screen_is_prohibit_interrupted() 
+               && false == mmi_health_measure_state_is_ui_measure()
                && false == wechat_msg_voice_is_playing() 
                && false == wechat_msg_voice_is_recording()
                && false == wechat_msg_item_is_sending()