From 2fbbf0f6dccacf0ee8ad1f28c9e654f337e025a5 Mon Sep 17 00:00:00 2001 From: hcj <1224667075@qq.com> Date: Fri, 1 Aug 2025 15:59:28 +0800 Subject: [PATCH] =?utf8?q?task=20=E5=90=AF=E5=8A=A8=E5=A2=9E=E5=8A=A0=20na?= =?utf8?q?me=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../slip/cat1Service/cat1_ai_server.cpp | 51 ++++++++++++------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ai_server.cpp b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ai_server.cpp index 1fdb886ed..fb7ba1dce 100644 --- a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ai_server.cpp +++ b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ai_server.cpp @@ -612,11 +612,16 @@ errcode_t chat_server_init(void) { int osThreadGetState_t= osThreadGetState(chat_taskcfg.task_handle); + const char *buf= osThreadGetName(chat_taskcfg.task_handle); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"chat osThreadGetState_t %d!\r\n",osThreadGetState_t); - if(osThreadGetState_t!=osThreadReady && osThreadGetState_t!=osThreadError && osThreadGetState_t !=osThreadInactive) + if(strcmp("chat_server_init",buf)==0) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"osThreadGetState is %d!\r\n",osThreadGetState_t); - return ERRCODE_FAIL; + if(osThreadGetState_t!=osThreadReady && osThreadGetState_t!=osThreadError && osThreadGetState_t !=osThreadInactive) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"osThreadGetState is %d!\r\n",osThreadGetState_t); + return ERRCODE_FAIL; + } } if(chat_client || is_bk_websocket_chat ) @@ -994,13 +999,13 @@ void bk_websocket_asr(void *data) { } break; } - if(type==WS_TEXT) + if(type==WS_TEXT) { - if(false== aer_result_analysis(asr_recv_buf)) - { - printf("WS_lwip_close false== aer_result_analysis(asr_recv_buf)\r\n"); - break; - } + if(false== aer_result_analysis(asr_recv_buf)) + { + printf("WS_lwip_close false== aer_result_analysis(asr_recv_buf)\r\n"); + break; + } } if(type==WS_PONG) { @@ -1030,15 +1035,21 @@ void bk_websocket_asr(void *data) { errcode_t asr_server_init(void) { - int osThreadGetState_t= osThreadGetState(asr_taskcfg.task_handle); + int osThreadGetState_t= osThreadGetState(asr_taskcfg.task_handle); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"chat osThreadGetState_t %d!\r\n",osThreadGetState_t); - if(osThreadGetState_t!=osThreadReady && osThreadGetState_t!=osThreadError && osThreadGetState_t !=osThreadInactive) + const char *buf= osThreadGetName(asr_taskcfg.task_handle); + + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"chat osThreadGetState_t %d %s!\r\n",osThreadGetState_t,buf); + if(strcmp("asr_server_init",buf)==0) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"osThreadGetState is %d!\r\n",osThreadGetState_t); - return ERRCODE_FAIL; + if(osThreadGetState_t!=osThreadReady && osThreadGetState_t!=osThreadError && osThreadGetState_t !=osThreadInactive) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"osThreadGetState is %d!\r\n",osThreadGetState_t); + return ERRCODE_FAIL; + } } + if(is_bk_websocket_asr || asr_client!=NULL) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"cat1_tcp_server_init is connet!\r\n"); @@ -1414,11 +1425,16 @@ errcode_t tts_server_init(void) { int osThreadGetState_t= osThreadGetState(tts_taskcfg.task_handle); + const char *buf= osThreadGetName(tts_taskcfg.task_handle); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"tts osThreadGetState_t %d!\r\n",osThreadGetState_t); - if(osThreadGetState_t!=osThreadReady && osThreadGetState_t!=osThreadError && osThreadGetState_t !=osThreadInactive) + if(strcmp("tts_server_init",buf)==0) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"osThreadGetState is %d!\r\n",osThreadGetState_t); - return ERRCODE_FAIL; + if(osThreadGetState_t!=osThreadReady && osThreadGetState_t!=osThreadError && osThreadGetState_t !=osThreadInactive) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"osThreadGetState is %d!\r\n",osThreadGetState_t); + return ERRCODE_FAIL; + } } if(tts_client!=NULL || is_bk_websocket_tts) @@ -1543,6 +1559,7 @@ static void time_sync_func(void) { if(chat_client_ping) { + chat_server_deinit(); lwip_close_websocket_client(chat_client); chat_client=NULL; -- 2.17.1