gengxin

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat.c
index 99e9fce..9f2bde1 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat.c
@@ -259,6 +259,21 @@ bool wechat_msg_item_is_sending(void)
        return result;
 }
 
+bool wechat_screen_is_prohibit_interrupted(void)
+{
+       bool result = false;
+       
+       if(true == wechat_msg_voice_is_recording()
+               || true == wechat_msg_item_is_sending()
+               || true == wechat_msg_voice_is_playing()
+               )
+       {
+               result = true;
+       }
+
+       return result;
+}
+
 void wechat_receive_audio_play_audio_ctrl_callback(AUDIO_CTRL_PRIORITY priority)
 {
        WECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: priority=%d\n", __FUNCTION__, __LINE__, priority);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat.h b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat.h
index 7b265b3..b1e32f4 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat.h
@@ -113,9 +113,7 @@ typedef struct
 void mmi_wechat_msg_info_init(void);
 void wechat_msg_info_nv_write(void);
 
-bool wechat_msg_voice_is_playing(void);
-bool wechat_msg_voice_is_recording(void);
-bool wechat_msg_item_is_sending(void);
+bool wechat_screen_is_prohibit_interrupted(void);
 
 void wechat_msg_receive_update_ui(void);
 bool wechat_msg_receive_from_server(char * data_buff, int data_buff_len, nv_wechat_msg_type_e type);

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_circle.c b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_circle.c
index fddf99c..fcea522 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_circle.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/mmi_wechat/wechat_circle.c
@@ -259,6 +259,21 @@ bool wechat_msg_item_is_sending(void)
        return result;
 }
 
+bool wechat_screen_is_prohibit_interrupted(void)
+{
+       bool result = false;
+       
+       if(true == wechat_msg_voice_is_recording()
+               || true == wechat_msg_item_is_sending()
+               || true == wechat_msg_voice_is_playing()
+               )
+       {
+               result = true;
+       }
+
+       return result;
+}
+
 void wechat_receive_audio_play_audio_ctrl_callback(AUDIO_CTRL_PRIORITY priority)
 {
        WECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: priority=%d\n", __FUNCTION__, __LINE__, priority);

diff --git a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_common.c b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_common.c
index 6a81247..13d021c 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_common.c
+++ b/2.sdk/sdk/gui/lv_watch/mmi_sundry/mmi_common.c
@@ -160,6 +160,7 @@ signed int mmi_hex_string_to_number(signed char* hex_str, unsigned char hex_str_
        return int_value;
 }
 
+// hex str:4 -> utf8:3
 bool mmi_unicode_hex_str_to_utf8_str(unsigned char * src, uint32_t src_len, unsigned char * dest, uint32_t * dest_len)
 {
        if ((NULL == src) || (0 == src_len) || (NULL == dest))

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 28311a7..3847449 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
@@ -133,10 +133,7 @@ static void mmi_watch_search_audio_ctrl_callback(AUDIO_CTRL_PRIORITY priority)
        
     if(AUDIO_CTRL_PRIORITY_SEARCH == priority) 
        {
-        //if (AUDIO_CTRL_PRIORITY_SEARCH == Hal_Audio_Manage_Start_Req(AUDIO_CTRL_PRIORITY_SEARCH, mmi_watch_search_audio_ctrl_callback))
-        //{
-        //    Hal_NFFS_File_Play_Repeat(AUDIO_WATCH_SEARCH, HAL_AUDIO_SPK_LEVEL_MAX);
-        //}
+
     } 
        else if(AUDIO_CTRL_PRIORITY_SEARCH > priority) 
        {
@@ -255,10 +252,7 @@ void mmi_watch_searching_aciton(void)
        }
 
 #ifdef __MMI_WECHAT_SUPPORT__
-       if(true == wechat_msg_voice_is_recording()
-               || true == wechat_msg_item_is_sending()
-               || true == wechat_msg_voice_is_playing()
-               )
+       if(true == wechat_screen_is_prohibit_interrupted())
        {
                return;
        }