From dd0defd72a5c6eb58e4706b2fb0eea14a7b2d4ff Mon Sep 17 00:00:00 2001
From: xue <2144439972@qq.com>
Date: Thu, 25 Dec 2025 11:24:26 +0800
Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E8=AF=9D=E8=B6=85?=
 =?utf8?q?=E6=97=B620=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../thunderbird/src/ThunderBirdMainView.cpp    | 18 +++++++++---------
 .../thunderbird/src/ThunderBirdModel.cpp       |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

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 27319b0cc..ac917ef0b 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
@@ -771,15 +771,6 @@ namespace OHOS
             videoPlay_ = newPlayer;
             g_videoPlay = videoPlay_;
             
-            // 隐藏最后一帧视图
-            if (firstFrameReady && lastFrameView_ != nullptr && lastFrameView_->IsVisible())
-            {
-                usleep(200000); // 200ms
-                lastFrameView_->SetVisible(false);
-                lastFrameView_->Invalidate();
-                WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ThunderBirdMainView::SwitchVideo: Hidden last frame view, new player first frame rendered");
-            }
-            
             // 更新当前播放的视频路径
             currentVideoPath_ = targetPath;
             
@@ -793,6 +784,15 @@ namespace OHOS
             // 清除切换视频标志
             g_isSwitchingVideo = false;
             
+            // 隐藏最后一帧视图（放到最后，确保新播放器已经完全接管显示）
+            if (firstFrameReady && lastFrameView_ != nullptr && lastFrameView_->IsVisible())
+            {
+                usleep(200000); // 200ms
+                lastFrameView_->SetVisible(false);
+                lastFrameView_->Invalidate();
+                WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ThunderBirdMainView::SwitchVideo: Hidden last frame view, new player first frame rendered");
+            }
+            
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ThunderBirdMainView::SwitchVideo: Successfully switched to video: %s", uri);
             return true;
         }
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 c1bd8f4be..1610c1e8e 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
@@ -3117,9 +3117,9 @@ extern "C" {
             if (ThunderBirdMainView::GetInstance() && ThunderBirdMainView::GetInstance()->listenIcon) {
                 ThunderBirdMainView::GetInstance()->listenIcon->SetVisible(true);
             }
-            // 启动8秒定时器，时间到就退出对话
-            StartCountUpTimer(10);
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::HandleAudioPlaybackEnd: 启动10秒定时器，时间到就退出对话");
+            // 启动20秒定时器，时间到就退出对话
+            StartCountUpTimer(20);
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdModel::HandleAudioPlaybackEnd: 启动20秒定时器，时间到就退出对话");
             return;
         }
         // 检查是否在THUNDERBIRD_LULLABYVIEW_3界面，且角色已经开始询问并询问完毕
-- 
2.17.1