From 6a7f693a8178a5ca4bc8c80a1b6ec663dcfca1be Mon Sep 17 00:00:00 2001
From: xue <2144439972@qq.com>
Date: Sat, 17 Jan 2026 18:19:48 +0800
Subject: [PATCH] =?utf8?q?=E6=89=8B=E5=8A=A8=E9=80=80=E5=87=BA=E5=93=84?=
 =?utf8?q?=E7=9D=A1=E4=B8=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BF=AE=E6=94=B9?=
 =?utf8?q?=E6=88=90=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../thunderbird/src/ThunderBirdPresenter.cpp  | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

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 04407db5e..35ba0a4e5 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
@@ -839,19 +839,28 @@ namespace OHOS
             // THUNDERBIRD_LULLABYVIEW_4 时按 VENDOR_UP 键会触发音量调节（IsVolumeAdjustmentAvailable 返回 true），
             // 不会执行到这里。从 VIEW_4 跳转到 VIEW_5 应该通过长按 FUNC 键触发（HandleFuncKeyLongPress）。
             case ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_5:
-                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);
-                ThunderBirdModel::GetInstance()->HighFrequence();//恢复视频帧率
-                // ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON); // 关闭屏幕常亮
-                // ThunderBirdModel::GetInstance()->g_sleep_mode_active = false;//睡眠模式激活标志位
-                ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_DIALOGUEVIEW, ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_STATUS_SHOW);
-                break;
+             // 停止故事模式超时定时器
+            // StopStoryModeTimeoutTimer();
+            // // 停止故事模式音频播放超时定时器
+            // StopStoryAudioPlaybackTimeoutTimer();
+            // // 重置故事模式finished标志
+            // ThunderBirdModel::GetInstance()->m_storyModeFinished = false;
+            // // 重置第一句音频播放标志
+            // ThunderBirdModel::GetInstance()->m_firstStoryAudioPlayed = false;
+            //     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);
+            //     ThunderBirdModel::GetInstance()->HighFrequence();//恢复视频帧率
+            //     // ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON); // 关闭屏幕常亮
+            //     // ThunderBirdModel::GetInstance()->g_sleep_mode_active = false;//睡眠模式激活标志位
+            //     ThunderBirdMainView::GetInstance()->ChangeView(currentView, THUNDERBIRD_DIALOGUEVIEW, ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_STATUS_SHOW);
+            ThunderBirdModel::GetInstance()->HandleSleepModeEnd();
+            break;
         }
         }
         else if(keyType == KEY_TYPE_VENDOR_DOWN)
-- 
2.17.1