From: CCC <2393524978@qq.com>
Date: Mon, 4 Sep 2023 01:30:07 +0000 (+0800)
Subject: gengxin
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=1e73b82df8a4cd0ac4797e7186fa6235ad06d786;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 8a412a81..55ab6e69 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
@@ -127,6 +127,8 @@ void wechat_msg_info_new_item_add(nv_watch_wechat_msg_item_info_t * msg_item)
 		s_wechat_msg_info->msg_count--;
 	}
 
+	WECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+	
 	s_wechat_msg_info->msg_count++;
 	_lv_memcpy(&(s_wechat_msg_info->msg_item[s_wechat_msg_info->msg_count - 1]), msg_item, msg_item_info_size);
 }
@@ -970,6 +972,7 @@ void wechat_msg_recording_cb(MCI_EVNET_T event , MCI_INFO_T info_type, int32_t v
 	switch(ext->event) 
 	{
 		case MCI_EVENT_EOS:
+			WECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
 			//lv_watch_del_interface(ACT_ID_WECHAT_RECORDING);
 			if(NULL != activity_obj)
 			{
@@ -979,6 +982,7 @@ void wechat_msg_recording_cb(MCI_EVNET_T event , MCI_INFO_T info_type, int32_t v
 			break;
 			
 		case MCI_EVENT_ERROR:
+			WECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
 			lv_wechat_msg_recording_ext_t * recording_ext = (lv_wechat_msg_recording_ext_t *)wechat_actId_ext_get(ACT_ID_WECHAT_RECORDING);
 			if(NULL != recording_ext)
 			{
@@ -1208,6 +1212,7 @@ void wechat_msg_record_button_event_cb(lv_obj_t * obj, lv_event_t e)
 			if(NULL == recording_ext) 
 				return NULL;
 
+			WECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
             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();
@@ -1237,6 +1242,7 @@ void wechat_msg_record_button_event_cb(lv_obj_t * obj, lv_event_t e)
                 }
             }
 
+			WECHAT_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
 			Hal_File_Record_Stop_Req(&(recording_ext->file_size));
 			recording_ext->file_size = 0;
 			Hal_Audio_Manage_End_Ind(AUDIO_CTRL_PRIORITY_5);
diff --git a/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_manage.c b/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_manage.c
index dc74ad02..093f2699 100644
--- a/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_manage.c
+++ b/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_manage.c
@@ -295,8 +295,17 @@ static void mmi_modem_tcp_read_cmdmsg_handler(void* sokcet_param)
 /*To send packets*/
 static void mmi_modem_tcp_send_cmdmsg_handler(void * package_data)
 {
+	printf("[@CHENG_DEBUG][%s][%d]: \n",__FUNCTION__, __LINE__);
+	
 	if(tcp_manage_instance.connecting_flag)
+	{
+		int cmd_type = ((send_cmdmsg_t * )package_data)->cmd_type;
+		
+		printf("[@CHENG_DEBUG][%s][%d]: \n",__FUNCTION__, __LINE__);
+		mmi_protocol_send_space_free(cmd_type);
 		return;
+	}
+	//return;
 	
 	send_tcp_cmdmsg_handler_interface(package_data);
 }
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 37d6b44d..311caf70 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
@@ -116,7 +116,10 @@ void send_tcp_cmdmsg_handler_impl(void *param)
 	printf("[@CHENG_DEBUG][%d]: str=%s\n", __LINE__, send_cmdmsg_buff + 33);
 	printf("[@CHENG_DEBUG][%d]: str=%s\n", __LINE__, send_cmdmsg_buff + 59);
 	
-	mmi_modem_tcp_send(send_cmdmsg_buff, send_cmdmsg_size);
+	if((NULL != send_cmdmsg_buff) && (0 < send_cmdmsg_size))
+	{
+		mmi_modem_tcp_send(send_cmdmsg_buff, send_cmdmsg_size);
+	}
 	
 	mmi_protocol_send_space_free(cmd_type);
 
diff --git a/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_task.c b/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_task.c
index a06be2da..2900143c 100644
--- a/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_task.c
+++ b/2.sdk/sdk/gui/lv_watch/modem/mmi_modem_tcp/mmi_modem_tcp_task.c
@@ -177,7 +177,10 @@ void send_task_msg_tcp_write_msg(int cmd_type, void* cmd_param)
     }
 	else
 	{
-		uart_printf("%s, The queue is full!\n",__func__);
+		printf("[@CHENG_DEBUG][%s][%d]: the queue is full\n",__FUNCTION__, __LINE__);
+		mmi_protocol_send_space_free(cmd_type);
+
+		//uart_printf("%s, The queue is full!\n",__func__);
 	}
 }