优化对话初始化

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 2eecea8..15acf9f 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdPresenter.cpp
@@ -184,7 +184,7 @@ namespace OHOS
 #ifdef CUSTOM_UTILS
        if(custom_get_factory_test_flag())
         return;
-#endif
+#endif       
         //如果在二维码界面 判断是否绑定
         if(ThunderBirdMainView::GetInstance() != nullptr)
        { 
@@ -320,18 +320,18 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HandleFuncKey: KEY_TYPE_FUNC press");
             
             // 在非对话模式下按下FUNC键时，预先初始化音频（需要WebSocket已连接）
-            if (!isDialogueing && ((currentView == THUNDERBIRD_DIALOGUEVIEW && currentSubView == ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_STATUS_SHOW) 
-            || (currentView == THUNDERBIRD_GUIDEVIEW))) {
-                // 检查WebSocket连接状态
-                int wsState = ln_ws_get_connection_state();
-                bool wsConnected = (wsState == 2); // WS_STATE_CONNECTED = 2
-                if (wsConnected) {
-                    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "非对话模式下FUNC键按下，WebSocket已连接，预先初始化音频");
-                    do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_AUDIO_INIT, NULL, 0);
-                } else {
-                    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "非对话模式下FUNC键按下，WebSocket未连接，不预初始化音频 (wsState=%d)", wsState);
-                }
-            }
+            // if (!isDialogueing && ((currentView == THUNDERBIRD_DIALOGUEVIEW && currentSubView == ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_STATUS_SHOW) 
+            // || (currentView == THUNDERBIRD_GUIDEVIEW))) {
+            //     // 检查WebSocket连接状态
+            //     int wsState = ln_ws_get_connection_state();
+            //     bool wsConnected = (wsState == 2); // WS_STATE_CONNECTED = 2
+            //     if (wsConnected) {
+            //         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "非对话模式下FUNC键按下，WebSocket已连接，预先初始化音频");
+            //         do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_AUDIO_INIT, NULL, 0);
+            //     } else {
+            //         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "非对话模式下FUNC键按下，WebSocket未连接，不预初始化音频 (wsState=%d)", wsState);
+            //     }
+            // }
             
             if(currentView == THUNDERBIRD_LULLABYVIEW && currentSubView == ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_3)
             { 
@@ -795,9 +795,9 @@ namespace OHOS
             if((currentView == THUNDERBIRD_DIALOGUEVIEW && currentSubView == ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_STATUS_SHOW) 
             || (currentView == THUNDERBIRD_GUIDEVIEW))
             {
+                do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_AUDIO_INIT, NULL, 0);
                 ThunderBirdModel::GetInstance()->LowFrequence();//减低视频帧率
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "进入对话模式");
-                
                 // 检查WebSocket连接状态
                 int wsState = ln_ws_get_connection_state();
                 bool wsConnected = (wsState == 2); // WS_STATE_CONNECTED = 2