修复哄睡字幕显示区域异常bug

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 7c87997..80070bd 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdLullabyView.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdLullabyView.cpp
@@ -237,7 +237,7 @@ namespace OHOS
         {
         case THUNDERBIRD_LULLABYVIEW_1:
         {
-            listenAnimator->Stop();
+            // listenAnimator->Stop();
             if (TextLabel)
             {
                 TextLabel->SetPosition(43, 64, 280, 42);
@@ -254,7 +254,7 @@ namespace OHOS
         }
         case THUNDERBIRD_LULLABYVIEW_2:
         {
-            listenAnimator->Stop();
+            // listenAnimator->Stop();
             ThunderBirdMainView::GetInstance()->OpenBackGround();
             if (TextLabel)
             {
@@ -337,7 +337,10 @@ namespace OHOS
         }
         case THUNDERBIRD_LULLABYVIEW_4:
         {
-            listenAnimator->Stop();
+            if(listenAnimator)
+            {
+                listenAnimator->Stop();
+            }
             ThunderBirdModel::GetInstance()->LowFrequence();//减低视频帧率
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ThunderBirdLullabyView::Show: THUNDERBIRD_LULLABYVIEW_4");
             
@@ -417,7 +420,7 @@ namespace OHOS
         }
         case THUNDERBIRD_LULLABYVIEW_5:
         {  
-            listenAnimator->Stop();
+            // listenAnimator->Stop();
             ThunderBirdMainView::GetInstance()->OpenBackGround();
             // 进入VIEW_5之前，保存当前VIEW_4的文本（如果不是默认文本）
             if (TextLabel) {

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 bc6b8ac..3d24679 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
@@ -1363,8 +1363,15 @@ namespace OHOS
 
     void ThunderBirdMainView::OpenBackGround(void)//打开遮罩
     {
-        iconView->SetVisible(true);
-        backGroundView->SetVisible(true);
+        if(iconView->IsVisible() == false)
+        {
+            iconView->SetVisible(true);
+        }
+        if(backGroundView->IsVisible() == false)
+        {
+            backGroundView->SetVisible(true);
+            backGroundView->Invalidate();
+        }
     }
     void ThunderBirdMainView::InvalidateGroup1(bool state)//黄色背景刷新
     {