优化视频

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 eef307b..f542e71 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdMainView.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdMainView.cpp
@@ -695,8 +695,12 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdMainView:: SystemViewId Overstep ones bounds");
             return;
         }
-        if(hideView == THUNDERBIRD_BLUEVIEW)
+        if(hideView == THUNDERBIRD_BLUEVIEW && showView != THUNDERBIRD_BLUEVIEW)
         {
+            if(videoPlay_ != nullptr && videoPlay_->isPause_)
+            {
+                videoPlay_->ResumeVideoPlay();
+            }
             InvalidateGroup1(false);
         }
         if (hideView != MAXVIEW)
@@ -713,25 +717,14 @@ namespace OHOS
             iconView->SetVisible(false);
         }
         backGroundView->SetVisible(false);
-        // 如果当前界面是需要常亮的界面，则关闭常亮并设置息屏时间
-        if((currentView_ == THUNDERBIRD_DIALOGUEVIEW && 
-            (currentSubView_ == ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_SPEAKING || 
-             currentSubView_ == ThunderBirdDialogueView::THUNDERBIRD_DIALOGUEVIEW_LISTENING)) || 
-           (currentView_ == THUNDERBIRD_LULLABYVIEW && currentSubView_ == ThunderBirdLullabyView::THUNDERBIRD_LULLABYVIEW_4))
-        {
-            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ThunderBirdMainView::ChangeView: 从常亮界面退出，关闭屏幕常亮，重新设置息屏时间");
-            // ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON); // 关闭屏幕常亮
-            // uapi_setScreenDuration(30000); // 重新设置30秒自动息屏
-            //ThunderBirdModel::GetInstance()->HighFrequence();
-        }
-       
+
         // OTA界面已独立为slice，不再需要此检查
         // 保存上一级视图信息（如果是GoBackToPreviousView调用，则不更新prevView_和prevSubView_）
-        if (!isGoingBack_)
-        {
-            prevView_ = currentView_;
-            prevSubView_ = currentSubView_;
-        }
+        // if (!isGoingBack_)
+        // {
+        //     prevView_ = currentView_;
+        //     prevSubView_ = currentSubView_;
+        // }
         ClickFunc(showView);
         group[showView]->SetVisible(true);
         group[showView]->SetStyle(STYLE_BACKGROUND_OPA, 0x00);
@@ -753,7 +746,6 @@ namespace OHOS
                     g_pThunderBirdLullabyView->Show(subView);
                 }
                 break;
-            // OTA界面已独立为slice，不再需要此case
             case THUNDERBIRD_DIALOGUEVIEW:
                 if (g_pThunderBirdDialogueView)
                 {