From 3a87796f949968375d99c780f0c8377b01b12ba5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E5=AD=99=E6=98=A5=E9=98=B3?= Date: Mon, 29 Dec 2025 09:43:53 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=AD=A3haisi=5Fwebsocket=20=E7=BD=91?= =?utf8?q?=E7=BB=9C=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../zhihui/websocket/os_ws/haisi_websocket.c | 25 ++++--------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/code/sdk/zhihui/websocket/os_ws/haisi_websocket.c b/code/sdk/zhihui/websocket/os_ws/haisi_websocket.c index a3a34c4de..14af74d5d 100644 --- a/code/sdk/zhihui/websocket/os_ws/haisi_websocket.c +++ b/code/sdk/zhihui/websocket/os_ws/haisi_websocket.c @@ -738,8 +738,9 @@ int uapi_ws_start(const ws_call_backs_t *callbacks) int uapi_ws_send_text(const char *text) { if (!text) return -1; - if (g_ws_connected != WS_STATE_CONNECTED || g_ws_client_fd < 0) { - HAISI_WS_WARN("Cannot send text, connection state: %d\n", g_ws_connected); + int network_status = uapi_dev_runtime_get_cat1_networkstat(); + if (network_status != 1 || g_ws_connected != WS_STATE_CONNECTED || g_ws_client_fd < 0) { + HAISI_WS_WARN("Cannot send text, connection state: %d , network_status: %d\n", g_ws_connected,network_status); return -1; } @@ -752,24 +753,8 @@ int uapi_ws_send_text(const char *text) HAISI_WS_DEBUG("uapi_ws_send_text: %s\n", text); // 发送数据 HAISI_WS_WARN("uapi_ws_send_text \n"); - // - extern int ln_ws_get_connection_state(void); - int ret = 0; - int network_status = uapi_dev_runtime_get_cat1_networkstat(); - //获取websocket连接状态 - int wsState = ln_ws_get_connection_state(); - bool wsConnected = (wsState == 2); // WS_STATE_CONNECTED = 2 - if(network_status == 1 && wsConnected == true) - { - HAISI_WS_WARN("uapi_ws_send_text success: network_status=%d, wsConnected=%d\n", network_status, wsConnected); - ret = WebSocketClientSendText(g_ws_client_fd, text, strlen(text)); - } - else - { - HAISI_WS_WARN("uapi_ws_send_text failed: network_status=%d, wsConnected=%d\n", network_status, wsConnected); - ret = -1; - } - // HAISI_WS_DEBUG("uapi_ws_send_text ret: %d\n", ret); + int ret = WebSocketClientSendText(g_ws_client_fd, text, strlen(text)); + HAISI_WS_DEBUG("uapi_ws_send_text ret: %d\n", ret); // 更新最后发送时间 if (ret == 0) { -- 2.17.1