优化意图识别取消回对话的逻辑

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 db62234..9ae40b0 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
@@ -576,6 +576,8 @@ namespace OHOS
                         ThunderBirdLullabyView::GetInstance()->listenAnimator->Stop();
                     }
                     //跳转到故事界面
+                    // 进入哄睡模式时切换为眨眼表情
+                    ThunderBirdModel::GetInstance()->OnEnterLullabyMode();
                     ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_LULLABYVIEW, ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_4);
                     return;
                 }
@@ -762,6 +764,8 @@ namespace OHOS
                 //ln_ws_send_random_story_request("随机故事");
                 break;
             case ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_3:
+                // 进入哄睡模式时切换为眨眼表情
+                ThunderBirdModel::GetInstance()->OnEnterLullabyMode();
                 ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_LULLABYVIEW, ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_4);
                 // ln_ws_start_audio_chat(LN_AUDIO_CHAT_CHOOSE_STORY_REQUEST);
                 ln_ws_audio_init();//功耗优化
@@ -775,7 +779,8 @@ namespace OHOS
                 ln_ws_end_audio_chat();//结束对话
                 uapi_set_sleep_mode_active(false);//睡眠模式激活标志位
                 do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_STORY_FINISH, NULL, 0);//确认结束哄睡
-                // 退出对话模式时恢复表情
+                // 退出哄睡模式时恢复时间线表情
+                ThunderBirdModel::GetInstance()->OnExitLullabyMode();
                 AI_ForceInterrupt();
                 ln_ws_send_voice_chat_interrupt("退出哄睡");
                 do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_AUDIO_DEINIT, NULL, 0);
@@ -794,23 +799,23 @@ namespace OHOS
                     AI_ForceInterrupt();
                     ln_ws_send_voice_chat_interrupt("退出哄睡");
                     ln_ws_start_audio_chat(LN_AUDIO_CHAT_VOICE_CHAT_REQUEST);//开始对话
-                    ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_DIALOGUEVIEW, ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_SPEAKING);
+                    ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_DIALOGUEVIEW, ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_LISTENING);
                  
                     break;
                 case ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_3:
                 {
                     //开启vad
-                    int vad_ret = ln_ws_enable_vad_server();
-                    if (vad_ret == 0) {
-                        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "VAD已成功启用");
-                    } else {
-                        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "启用VAD失败: %d", vad_ret);
-                    }
+                    // int vad_ret = ln_ws_enable_vad_server();
+                    // if (vad_ret == 0) {
+                    //     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "VAD已成功启用");
+                    // } else {
+                    //     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "启用VAD失败: %d", vad_ret);
+                    // }
                     ln_ws_end_audio_chat();//结束对话
                     AI_ForceInterrupt();
                     ln_ws_send_voice_chat_interrupt("退出哄睡");
                     ln_ws_start_audio_chat(LN_AUDIO_CHAT_VOICE_CHAT_REQUEST);//开始对话
-                    ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_DIALOGUEVIEW, ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_SPEAKING);
+                    ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_DIALOGUEVIEW, ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_LISTENING);
                 }
                     break;
                 case ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_5: