对话界面不息屏

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdDialogueView.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdDialogueView.cpp
index 551d3e4..2a837b3 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdDialogueView.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdDialogueView.cpp
@@ -163,14 +163,17 @@ namespace OHOS
         {
         case THUNDERBIRD_DIALOGUEVIEW_SPEAKING:
         {
+            ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON);
             if (TextLabel)
             {
                 TextLabel->SetPosition(0, 64, 360, 42);
+                TextLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
                 TextLabel->SetVisible(true);
             }
             if (TextLabel_Y)
             { 
                 TextLabel_Y->SetPosition(2, 66, 360, 42);
+                TextLabel_Y->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
                 TextLabel_Y->SetVisible(true);  
             }
             if(ThunderBirdModel::GetInstance()->IsTextEmpty() == true)
@@ -188,6 +191,7 @@ namespace OHOS
         }
         case THUNDERBIRD_DIALOGUEVIEW_LISTENING:
         {
+            ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON);
             if (TextLabel)
             {
                 TextLabel->SetPosition(111, 64, 180, 42);

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 a3d4b9b..62482c1 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
@@ -569,6 +569,7 @@ namespace OHOS
         // 同用遮罩，部分界面在内部自行开启，其余界面关闭
         iconView->SetVisible(false);
         backGroundView->SetVisible(false);
+        ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON); // 关闭屏幕常亮
         // 保存上一级视图信息
         prevView_ = currentView_;
         prevSubView_ = currentSubView_;

diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdReminderView.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdReminderView.cpp
index a91b3c7..2cd4687 100644 (file)
--- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdReminderView.cpp
+++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdReminderView.cpp
@@ -3,6 +3,7 @@
 #include "thunderbird/include/ThunderBirdMainView.h"
 #include "battery_hal.h"
 #include "battery_service.h"
+#include "audio_manager.h"
 namespace OHOS
 {
     static ThunderBirdReminderView *g_pThunderBirdReminderView{nullptr};
@@ -398,6 +399,7 @@ namespace OHOS
         if (value < 0) { value = 0; }
         if (value > 100) { value = 100; }
         remindProgressValue_ = value;
+        AudioManager::GetInstance().SetVolume(AUDIO_STREAM_MUSIC, remindProgressValue_);
         VolumeProgress->SetValue(remindProgressValue_);
         VolumeProgress->Invalidate();
     }