From: xue <2144439972@qq.com> Date: Mon, 1 Dec 2025 06:38:46 +0000 (+0800) Subject: 取消哄睡提示提示界面的vad X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=222e384fb3215981337b9d59c1f56f2b03f4825c;p=mirrors%2FFD230.git 取消哄睡提示提示界面的vad --- diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdLullabyView.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdLullabyView.cpp index 975f52ad5..58fc16e50 100644 --- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdLullabyView.cpp +++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdLullabyView.cpp @@ -306,6 +306,13 @@ namespace OHOS } case THUNDERBIRD_LULLABYVIEW_3: { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "进入故事模式,关闭VAD"); + int vad_ret = ln_ws_disable_vad_server(); + if (vad_ret == 0) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "VAD已成功关闭"); + } else { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "关闭VAD失败: %d", vad_ret); + } listenAnimator->Stop(); // 重置哄睡录音标志位,确保进入界面时状态正确 if (ThunderBirdPresenter::GetInstance()) { diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp index 0f142212e..40db336cc 100644 --- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp +++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp @@ -2964,6 +2964,7 @@ extern "C" { // 检查是否是故事模式且已finished if (currentView == THUNDERBIRD_LULLABYVIEW && + currentSubView == ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_4 && m_storyModeFinished) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::HandleAudioPlaybackEnd: 故事模式finished且音频播放结束,结束故事模式"); 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 8021fac81..6e8b346a1 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 @@ -544,6 +544,9 @@ namespace OHOS if(isLullabyRecording == false) { + ln_ws_end_audio_chat();//结束对话 + AI_ForceInterrupt(); + // ln_ws_send_voice_chat_interrupt("进入哄睡"); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "开始录音"); // ThunderBirdModel::GetInstance()->StartRecording(); isLullabyRecording = true; @@ -771,11 +774,20 @@ namespace OHOS break; case ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_3: - 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); + { + //开启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); + } + 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); + } break; case ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_5: ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_LULLABYVIEW, ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_4);