From: xue <2144439972@qq.com> Date: Fri, 21 Nov 2025 08:44:32 +0000 (+0800) Subject: 音频初始化增加联网判断 X-Git-Tag: V1.0.9_20251128_194606_LN~24 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=b6955a2344f72cc4cb5eacea0321141e1044e19f;p=mirrors%2FFD230.git 音频初始化增加联网判断 --- diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp index 079d93b6e..75d6b9f69 100644 --- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp +++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp @@ -836,7 +836,7 @@ namespace OHOS bool wsConnected = (wsState == 2); // WS_STATE_CONNECTED = 2 //只要开机的时候检查 - if (!wsConnected && ThunderBirdModel::GetInstance()->init_falg == false && ln_ws_is_audio_initialized() == false) { + if (!wsConnected && ThunderBirdModel::GetInstance()->init_falg == false) { // WebSocket未连接,显示网络断开提醒界面,不设置定时器 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "进入对话模式时WebSocket未连接,显示网络断开提醒 (wsState=%d)", wsState); // 设置标志,表示用户想要进入对话模式但因为WebSocket未连接而显示提醒 diff --git a/code/sdk/zhihui/leiniao/imsl_ln/ln_api_websocket.c b/code/sdk/zhihui/leiniao/imsl_ln/ln_api_websocket.c index c5a303cb8..c5ffc4899 100644 --- a/code/sdk/zhihui/leiniao/imsl_ln/ln_api_websocket.c +++ b/code/sdk/zhihui/leiniao/imsl_ln/ln_api_websocket.c @@ -1120,6 +1120,12 @@ void ln_ws_audio_init(void) return; } + // 检查WebSocket连接状态,只有在WebSocket连接时才进行音频初始化 + if (g_ws_connected != WS_STATE_CONNECTED) { + LN_WS_WARN("WebSocket not connected (state=%d), skipping audio initialization\n", g_ws_connected); + return; + } + AIVoiceAudioParams audioParams_in = { .audioFormat = MP3, .channelCount = 1,