From f54715ce977fa2ecc6bc33614d17e5cbb4938c4d Mon Sep 17 00:00:00 2001
From: xue <2144439972@qq.com>
Date: Wed, 17 Dec 2025 15:35:24 +0800
Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96=E5=AF=B9=E8=AF=9D=E6=95=85?=
 =?utf8?q?=E4=BA=8B=E6=A8=A1=E5=BC=8F=E8=BF=9B=E9=80=80=E8=93=9D=E7=89=99?=
 =?utf8?q?=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../thunderbird/src/ThunderBirdMainView.cpp      |  5 +++++
 .../thunderbird/src/ThunderBirdModel.cpp         | 16 +++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdMainView.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdMainView.cpp
index 9c669fe09..7514a1574 100644
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdMainView.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdMainView.cpp
@@ -897,6 +897,11 @@ namespace OHOS
             }
             InvalidateGroup1(false);
         }
+        if(showView == THUNDERBIRD_BLUEVIEW && hideView == THUNDERBIRD_LULLABYVIEW)
+        {
+            do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_STORY_FINISH, NULL, 0);//确认结束哄睡
+            ThunderBirdModel::GetInstance()->OnExitLullabyMode();
+        }
         if (hideView != MAXVIEW)
         {
             if (group[hideView] == nullptr)
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 48eed8dd1..14500f5ab 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
@@ -2826,7 +2826,21 @@ extern "C" {
             //亮屏
             uapi_set_screen_on_api();
             int currentView = ThunderBirdMainView::GetInstance()->GetCurrentView(); //获取当前视图
-            
+            //如果在对话界面，则停止对话
+            if(currentView == THUNDERBIRD_DIALOGUEVIEW)
+            {
+                ln_ws_end_audio_chat();//结束对话
+                AI_ForceInterrupt();
+                ln_ws_send_voice_chat_interrupt("退出对话");
+                do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_AUDIO_DEINIT, NULL, 0);
+            }
+            //如果在哄睡界面，则停止哄睡
+            if(currentView == THUNDERBIRD_LULLABYVIEW)
+            {
+                do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_STORY_FINISH, NULL, 0);//确认结束哄睡
+                // 退出哄睡模式时恢复时间线表情
+                ThunderBirdModel::GetInstance()->OnExitLullabyMode();
+            }
             // 检查是否有已绑定的设备
             BluetoothModel* btModel = BluetoothModel::GetInstance();
             if (btModel != nullptr) {
-- 
2.17.1