From: @CHENG <2393524978@qq.com>
Date: Mon, 24 Jun 2024 09:12:51 +0000 (+0800)
Subject: gengxin
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=4307194ba6277548823fc240932301ffca9c1cf2;p=mirrors%2FASR3603_Z5.git

gengxin
---

diff --git a/2.sdk/sdk/product/craneg_modem/pcac/wsclient/libwebsockets/inc/common/esp_log.h b/2.sdk/sdk/product/craneg_modem/pcac/wsclient/libwebsockets/inc/common/esp_log.h
index 6275b806..c4c1e1e1 100644
--- a/2.sdk/sdk/product/craneg_modem/pcac/wsclient/libwebsockets/inc/common/esp_log.h
+++ b/2.sdk/sdk/product/craneg_modem/pcac/wsclient/libwebsockets/inc/common/esp_log.h
@@ -5,11 +5,21 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+#if 0
+#define ESP_LOGE( format, args... )   do{ cplog_printf( "[ws]"format, ##args ); }while(0)
+#define ESP_LOGW( format, args... )   do{ cplog_printf( "[ws]"format, ##args ); }while(0)
+#define ESP_LOGI( format, args... )   do{ cplog_printf( "[ws]"format, ##args ); }while(0)
+#define ESP_LOGD( format, args... )   do{ cplog_printf( "[ws]"format, ##args ); }while(0)
+#define ESP_LOGV( format, args... )   do{ cplog_printf( "[ws]"format, ##args ); }while(0)
+#else
 #define ESP_LOGE( format, args... )   do{ CPUartLogPrintf( "[ws]"format, ##args ); }while(0)
 #define ESP_LOGW( format, args... )   do{ CPUartLogPrintf( "[ws]"format, ##args ); }while(0)
 #define ESP_LOGI( format, args... )   do{ CPUartLogPrintf( "[ws]"format, ##args ); }while(0)
 #define ESP_LOGD( format, args... )   do{ CPUartLogPrintf( "[ws]"format, ##args ); }while(0)
 #define ESP_LOGV( format, args... )   do{ CPUartLogPrintf( "[ws]"format, ##args ); }while(0)
+#endif
+
 #ifdef __cplusplus
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/2.sdk/sdk/product/craneg_modem/pcac/wsclient/libwebsockets/src/mmi_aigc_chat_websocket.c b/2.sdk/sdk/product/craneg_modem/pcac/wsclient/libwebsockets/src/mmi_aigc_chat_websocket.c
index 3bcd13e6..3665cb92 100644
--- a/2.sdk/sdk/product/craneg_modem/pcac/wsclient/libwebsockets/src/mmi_aigc_chat_websocket.c
+++ b/2.sdk/sdk/product/craneg_modem/pcac/wsclient/libwebsockets/src/mmi_aigc_chat_websocket.c
@@ -17,9 +17,14 @@ extern void mmi_aigc_chat_websocket_recv_data_handler(char * data_ptr, int data_
 
 int mmi_aigc_chat_websocket_send_text_data(char * data_ptr, int data_len)
 {
-	int ret = 0;
+	int ret = -1;
 
-	AIGC_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+	AIGC_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: client_p=%#X\n", __FUNCTION__, __LINE__, s_aigc_chat_ws_client_p);
+	if(NULL == s_aigc_chat_ws_client_p)
+	{
+		return ret;
+	}
+	
     ret = chat_websocket_client_send_text(s_aigc_chat_ws_client_p, data_ptr, data_len, portMAX_DELAY);
 	if (0 > ret)
 	{
@@ -31,9 +36,14 @@ int mmi_aigc_chat_websocket_send_text_data(char * data_ptr, int data_len)
 
 int mmi_aigc_chat_websocket_send_binary_data(char * data_ptr, int data_len)
 {
-	int ret = 0;
+	int ret = -1;
 
-	AIGC_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+	AIGC_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: client_p=%#X\n", __FUNCTION__, __LINE__, s_aigc_chat_ws_client_p);
+	if(NULL == s_aigc_chat_ws_client_p)
+	{
+		return ret;
+	}
+	
     ret = chat_websocket_client_send_bin(s_aigc_chat_ws_client_p, data_ptr, data_len, portMAX_DELAY);
 	if (0 > ret)
 	{
@@ -103,6 +113,8 @@ static void mmi_aigc_chat_websocket_event_handler(int32_t event_id, void *event_
 
 void mmi_aigc_chat_websocket_app_start(void)
 {
+	mmi_aigc_chat_websocket_app_stop();
+
 	OS_STATUS status = 0;
 	int ret = 0;
     sim_esp_websocket_client_config_t websocket_cfg = {0};
@@ -130,14 +142,21 @@ void mmi_aigc_chat_websocket_app_start(void)
 	{
 
 	}
+
+	AIGC_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: client_p=%#X\n", __FUNCTION__, __LINE__, s_aigc_chat_ws_client_p);
 }
 
 void mmi_aigc_chat_websocket_app_stop(void)
 {
-	AIGC_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+	AIGC_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: client_p=%#X\n", __FUNCTION__, __LINE__, s_aigc_chat_ws_client_p);
 	
 	if(NULL != s_aigc_chat_ws_client_p)
+	{
 		chat_websocket_client_destroy(s_aigc_chat_ws_client_p);
+		s_aigc_chat_ws_client_p = NULL;
+	}
+
+	AIGC_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: client_p=%#X\n", __FUNCTION__, __LINE__, s_aigc_chat_ws_client_p);
 }
 
 #endif
diff --git a/2.sdk/sdk/product/craneg_modem/pcac/wsclient/libwebsockets/src/mmi_aigc_trans_websocket.c b/2.sdk/sdk/product/craneg_modem/pcac/wsclient/libwebsockets/src/mmi_aigc_trans_websocket.c
index b9254294..be34acb5 100644
--- a/2.sdk/sdk/product/craneg_modem/pcac/wsclient/libwebsockets/src/mmi_aigc_trans_websocket.c
+++ b/2.sdk/sdk/product/craneg_modem/pcac/wsclient/libwebsockets/src/mmi_aigc_trans_websocket.c
@@ -17,9 +17,14 @@ extern void mmi_aigc_trans_websocket_recv_data_handler(char * data_ptr, int data
 
 int mmi_aigc_trans_websocket_send_text_data(char * data_ptr, int data_len)
 {
-	int ret = 0;
+	int ret = -1;
+
+	AIGC_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: client_p=%#X\n", __FUNCTION__, __LINE__, s_aigc_trans_ws_client_p);
+	if(NULL == s_aigc_trans_ws_client_p)
+	{
+		return ret;
+	}
 
-	AIGC_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
     ret = sim_esp_websocket_client_send_text(s_aigc_trans_ws_client_p, data_ptr, data_len, portMAX_DELAY);
 	if (0 > ret)
 	{
@@ -31,9 +36,14 @@ int mmi_aigc_trans_websocket_send_text_data(char * data_ptr, int data_len)
 
 int mmi_aigc_trans_websocket_send_binary_data(char * data_ptr, int data_len)
 {
-	int ret = 0;
+	int ret = -1;
 
-	AIGC_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+	AIGC_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: client_p=%#X\n", __FUNCTION__, __LINE__, s_aigc_trans_ws_client_p);
+	if(NULL == s_aigc_trans_ws_client_p)
+	{
+		return ret;
+	}
+	
     ret = sim_esp_websocket_client_send_bin(s_aigc_trans_ws_client_p, data_ptr, data_len, portMAX_DELAY);
 	if (0 > ret)
 	{
@@ -103,6 +113,8 @@ static void mmi_aigc_trans_websocket_event_handler(int32_t event_id, void *event
 
 void mmi_aigc_trans_websocket_app_start(void)
 {
+	mmi_aigc_trans_websocket_app_stop();
+
 	OS_STATUS status = 0;
 	int ret = 0;
     sim_esp_websocket_client_config_t websocket_cfg = {0};
@@ -130,14 +142,21 @@ void mmi_aigc_trans_websocket_app_start(void)
 	{
 
 	}
+
+	AIGC_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: client_p=%#X\n", __FUNCTION__, __LINE__, s_aigc_trans_ws_client_p);
 }
 
 void mmi_aigc_trans_websocket_app_stop(void)
 {
-	AIGC_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+	AIGC_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: client_p=%#X\n", __FUNCTION__, __LINE__, s_aigc_trans_ws_client_p);
 	
 	if(NULL != s_aigc_trans_ws_client_p)
+	{
 		sim_esp_websocket_client_destroy(s_aigc_trans_ws_client_p);
+		s_aigc_trans_ws_client_p = NULL;
+	}
+
+	AIGC_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: client_p=%#X\n", __FUNCTION__, __LINE__, s_aigc_trans_ws_client_p);
 }
 
 #endif
diff --git a/2.sdk/sdk/product/craneg_modem/pcac/wsclient/libwebsockets/src/mmi_aigc_tts_websocket.c b/2.sdk/sdk/product/craneg_modem/pcac/wsclient/libwebsockets/src/mmi_aigc_tts_websocket.c
index ed97913a..dcb32c46 100644
--- a/2.sdk/sdk/product/craneg_modem/pcac/wsclient/libwebsockets/src/mmi_aigc_tts_websocket.c
+++ b/2.sdk/sdk/product/craneg_modem/pcac/wsclient/libwebsockets/src/mmi_aigc_tts_websocket.c
@@ -17,9 +17,14 @@ extern void mmi_aigc_tts_websocket_recv_data_handler(char * data_ptr, int data_l
 
 int mmi_aigc_tts_websocket_send_text_data(char * data_ptr, int data_len)
 {
-	int ret = 0;
+	int ret = -1;
+
+	AIGC_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: client_p=%#X\n", __FUNCTION__, __LINE__, s_aigc_tts_ws_client_p);
+	if(NULL == s_aigc_tts_ws_client_p)
+	{
+		return ret;
+	}
 
-	AIGC_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
     ret = tts_websocket_client_send_text(s_aigc_tts_ws_client_p, data_ptr, data_len, portMAX_DELAY);
 	if (0 > ret)
 	{
@@ -31,9 +36,14 @@ int mmi_aigc_tts_websocket_send_text_data(char * data_ptr, int data_len)
 
 int mmi_aigc_tts_websocket_send_binary_data(char * data_ptr, int data_len)
 {
-	int ret = 0;
+	int ret = -1;
 
-	AIGC_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+	AIGC_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: client_p=%#X\n", __FUNCTION__, __LINE__, s_aigc_tts_ws_client_p);
+	if(NULL == s_aigc_tts_ws_client_p)
+	{
+		return ret;
+	}
+	
     ret = tts_websocket_client_send_bin(s_aigc_tts_ws_client_p, data_ptr, data_len, portMAX_DELAY);
 	if (0 > ret)
 	{
@@ -103,6 +113,8 @@ static void mmi_aigc_tts_websocket_event_handler(int32_t event_id, void *event_d
 
 void mmi_aigc_tts_websocket_app_start(void)
 {
+	mmi_aigc_tts_websocket_app_stop();
+
 	OS_STATUS status = 0;
 	int ret = 0;
     sim_esp_websocket_client_config_t websocket_cfg = {0};
@@ -130,14 +142,21 @@ void mmi_aigc_tts_websocket_app_start(void)
 	{
 
 	}
+
+	AIGC_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: client_p=%#X\n", __FUNCTION__, __LINE__, s_aigc_tts_ws_client_p);
 }
 
 void mmi_aigc_tts_websocket_app_stop(void)
 {
-	AIGC_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+	AIGC_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: client_p=%#X\n", __FUNCTION__, __LINE__, s_aigc_tts_ws_client_p);
 	
 	if(NULL != s_aigc_tts_ws_client_p)
+	{
 		tts_websocket_client_destroy(s_aigc_tts_ws_client_p);
+		s_aigc_tts_ws_client_p = NULL;
+	}
+
+	AIGC_WB_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: client_p=%#X\n", __FUNCTION__, __LINE__, s_aigc_tts_ws_client_p);
 }
 
 #endif