From 82a28d7ef62a18e17d699bd77042f9ac85ddc3cf Mon Sep 17 00:00:00 2001
From: luozheng <1732036298@qq.com>
Date: Wed, 15 Jan 2025 12:03:30 +0800
Subject: [PATCH] =?utf8?q?=E8=A7=A3=E5=86=B3=E5=9B=A0=E6=B6=88=E6=81=AF?=
 =?utf8?q?=E5=AF=BC=E8=87=B4=E8=A7=A3=E7=BB=91=E5=85=B3=E6=9C=BA=E5=8A=A8?=
 =?utf8?q?=E7=94=BB=E5=B1=8F=E5=B9=95=E6=81=AF=E5=B1=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../rebootandshutdown/src/ShutDownImageAnimatorView.cpp      | 5 ++++-
 .../service/msg_center/src/notify/pairing_notification.cpp   | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/ShutDownImageAnimatorView.cpp b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/ShutDownImageAnimatorView.cpp
index d217f9972..3f6787577 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/ShutDownImageAnimatorView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/ShutDownImageAnimatorView.cpp
@@ -14,6 +14,7 @@
 #include "AppViewIDs.h"
 #include "NativeAbility.h"
 #include <custom_runtime.h>
+#include "uiservice/include/ui_service.h"
 namespace OHOS
 {
 
@@ -91,7 +92,9 @@ namespace OHOS
 
         uapi_dev_runtime_set_shutting_down_status(1);//设置关机状态runtime值
 
-        ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON); // 关机动画已经开始了不能息屏
+        ScreenOffEnable(false);
+        uapi_set_screen_on_api();
+        // ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON); // 关机动画已经开始了不能息屏
 
         uapi_take_to_wake(0); // 关闭抬腕亮屏，和息屏
 
diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/pairing_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/pairing_notification.cpp
index c0bd895dc..67d1986c2 100644
--- a/code/sdk/application/wearable/service/msg_center/src/notify/pairing_notification.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/notify/pairing_notification.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-03-22 10:04:36
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-12-23 18:25:27
+ * @LastEditTime: 2025-01-15 11:34:47
  * @FilePath: /FD230/code/sdk/application/wearable/service/msg_center/src/notify/pairing_notification.cpp
  */
 #include "notification_manager.h"
@@ -560,7 +560,7 @@ namespace OHOS
             ui_api_vibrate_once_func(); // 震动一次
         }
 
-        ScreenTurnOff();    //先设置为0
+        // ScreenTurnOff();    //先设置为0
         ScreenTurnOn(40 * 1000); // 亮屏操作  40秒关闭
 
         PairingViewEventListener::GetInstance().Pairing_StartTimer(); // 开启一个40s后弹窗自动销毁定时器
-- 
2.17.1