From 640f257fe06564040d4f7023b4e70883abc82db4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E7=BD=97=E6=AD=A3?= <1732036298@qq.com>
Date: Fri, 1 Nov 2024 08:53:44 +0000
Subject: [PATCH] Merge #1315 into sdk602patch0911 from refs/changes/1315/head
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

ScreenTurnOn与ScreenTurnOff配套使用优化

* refs/changes/1315/head: (3 commits squashed)

  - ScreenTurnOn与ScreenTurnOff配套使用优化

  - 解决蓝牙耳机按键退出有概率不取消常亮屏

  - Merge branch &#39;sdk602patch0911&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>

CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1315
---
 .../fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp   | 3 ++-
 .../fd230app/nativeui/bluetooth/src/BluetoothEarPhoneView.cpp | 1 -
 .../fd230app/nativeui/bluetooth/src/BluetoothModel.cpp        | 4 ++--
 .../nativeui/bluetooth/src/BluetoothReconnectView.cpp         | 1 +
 .../wearable/fd230app/nativeui/record/src/RecordingModel.cpp  | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

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/BluetoothEarPhoneView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothEarPhoneView.cpp
index c5167cf38..4a5bcec06 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothEarPhoneView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothEarPhoneView.cpp
@@ -307,7 +307,6 @@ namespace OHOS
         if (!ret)
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Bt is not Discovering");
-            return;
         }
         CancelBrScanHandle();
         return;
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()))
                 {
                     // 震动提醒
-- 
2.17.1