From: luozheng <1732036298@qq.com>
Date: Fri, 1 Nov 2024 07:55:44 +0000 (+0800)
Subject: ScreenTurnOn与ScreenTurnOff配套使用优化
X-Git-Tag: fd230_release_V1.3.102~29^2~88
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F1315%2F1;p=mirrors%2FFD230.git

ScreenTurnOn与ScreenTurnOff配套使用优化
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp
index 4d1a3666c..09e45f169 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-08-03 11:10:08
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-10-05 16:38:12
+ * @LastEditTime: 2024-11-01 15:46:19
  * @FilePath: /xts_origin/FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp
  */
 #include "aivoice/include/AiVoiceConnectingView.h"
@@ -66,6 +66,7 @@ namespace OHOS
             delete scrollView;
             scrollView = nullptr;
         }
+        ScreenTurnOff();
     }
 
     AiVoiceConnectingView *AiVoiceConnectingView::GetInstance(void)
diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp
index 97fdb7918..4fa4ea6e5 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothModel.cpp
@@ -947,7 +947,7 @@ static void ACLConnectionSuss(const bd_addr_t &bdAddr)
     {
         ui_api_vibrate_once_func();
     }
-    ScreenTurnOn(5*1000);
+    uapi_set_screen_on_api();
     /* -------------------------------------------------------------------------- */
 }
 
@@ -992,7 +992,7 @@ static void ACLConnectionFail(const bd_addr_t &bdAddr)
     {
         ui_api_vibrate_once_func();
     }
-    ScreenTurnOn(5*1000);
+    uapi_set_screen_on_api();
     /* -------------------------------------------------------------------------- */
 }
 
diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothReconnectView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothReconnectView.cpp
index 34e79e2f1..1b977f424 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothReconnectView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothReconnectView.cpp
@@ -54,6 +54,7 @@ BluetoothReconnectView::~BluetoothReconnectView()
         delete group;
         group = nullptr;
     }
+    ScreenTurnOff();
     stop_connect_timer();
     g_pBluetoothReconnectView = nullptr;
 }
diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingModel.cpp
index b977038b9..99cbf0231 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingModel.cpp
@@ -1090,7 +1090,7 @@ namespace OHOS
             // 录取时长不足，停止录制并弹出警告
             if (RecordingPresenter::GetInstance())
             {
-                ScreenTurnOn(3 * 1000); // 亮屏3s
+                uapi_set_screen_on_api();
                 if (true != OHOS::ConfigModel::GetInstance()->GetDnotdisturb() && (!uapi_sleep_mode_flag_get()))
                 {
                     // 震动提醒