From: CCC <2393524978@qq.com> Date: Tue, 12 Sep 2023 09:33:11 +0000 (+0800) Subject: gengxin X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=24303f1b3816cb572834e08171761eafa498340b;p=mirrors%2FASR3603_Z5.git gengxin --- 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 ab669624..2cd1b30d 100644 --- 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 @@ -415,10 +415,11 @@ bool wechat_msg_send_to_server(void) uint32_t file_size = ext->record_size; char * file_buf = lv_mem_alloc(file_size + 1); - if(NULL == file_buf) + if(NULL == file_buf || WECHAT_MSG_DATA_AMR_HEAD_SIZE >= file_size) { lv_mem_free(ext->record_buffer); ext->record_buffer = NULL; + ext->record_size = 0; return false; } _lv_memset_00(file_buf, file_size + 1); @@ -830,6 +831,7 @@ bool wechat_msg_recording_stop(bool is_cancel) { lv_mem_free(ext->record_buffer); ext->record_buffer = NULL; + ext->record_size = 0; return false; } @@ -837,6 +839,7 @@ bool wechat_msg_recording_stop(bool is_cancel) { lv_mem_free(ext->record_buffer); ext->record_buffer = NULL; + ext->record_size = 0; return false; } ext->record_size = size; diff --git a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.c b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.c index 60db7775..7e2c3521 100644 --- a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.c +++ b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_api.c @@ -329,7 +329,7 @@ bool mmi_protocol_check_state_before_send_action(void) } if(false == mmi_protocol_watch_bind_state_get()) { - PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: watch no bind\n", __FUNCTION__, __LINE__); + PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: watch not bind\n", __FUNCTION__, __LINE__); return false; } 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 18bc631f..9cfd0d09 100644 --- 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 @@ -183,7 +183,10 @@ static bool mmi_protocol_fzd_send_content_construct(MMI_PROTOCOL_FZD_ACTION_ENUM int convert_md5_str_len = 0; unsigned char md5_data_str[MMI_PROTOCOL_FZD_MD5_DATA_LEN + 1] = {0}; - if((false == watch_modem_sim_present_check_req()) || (false == mmi_watch_tcp_connect_state_get())) + if((false == watch_modem_sim_present_check_req()) + || (MMI_MODEM_SIGNAL_BAR_0 == watch_modem_get_signal_bar_req()) + || (false == mmi_watch_tcp_connect_state_get()) + ) { PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__); return false; diff --git a/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_msg_handler_impl.c b/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_msg_handler_impl.c index 311caf70..b56f42df 100644 --- a/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_msg_handler_impl.c +++ b/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_msg_handler_impl.c @@ -101,7 +101,9 @@ void send_tcp_cmdmsg_handler_impl(void *param) return; } - if(!watch_modem_sim_present_check_req()) + if((false == watch_modem_sim_present_check_req()) + || (MMI_MODEM_SIGNAL_BAR_0 == watch_modem_get_signal_bar_req()) + ) { printf("[@CHENG_DEBUG][%s][%d]: \n",__FUNCTION__,__LINE__); mmi_protocol_send_space_free(cmd_type); @@ -113,8 +115,8 @@ void send_tcp_cmdmsg_handler_impl(void *param) printf("[@CHENG_DEBUG][%s][%d]: action=%d,len=%d\n", __FUNCTION__, __LINE__, cmd_type, send_cmdmsg_size); printf("[@CHENG_DEBUG][%d]: str=%s\n", __LINE__, send_cmdmsg_buff); - printf("[@CHENG_DEBUG][%d]: str=%s\n", __LINE__, send_cmdmsg_buff + 33); - printf("[@CHENG_DEBUG][%d]: str=%s\n", __LINE__, send_cmdmsg_buff + 59); + //printf("[@CHENG_DEBUG][%d]: str=%s\n", __LINE__, send_cmdmsg_buff + 33); + //printf("[@CHENG_DEBUG][%d]: str=%s\n", __LINE__, send_cmdmsg_buff + 59); if((NULL != send_cmdmsg_buff) && (0 < send_cmdmsg_size)) {