From: 罗正 <1732036298@qq.com>
Date: Tue, 19 Nov 2024 12:00:35 +0000 (+0000)
Subject: Merge #1424 into sdk602patch0911 from refs/changes/1424/head
X-Git-Tag: fd230_release_V1.3.102~59^2~1
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=1fc773818c87fac89e510629c5e947602edec3d7;p=mirrors%2FFD230.git

Merge #1424 into sdk602patch0911 from refs/changes/1424/head

Code review from 罗正

* refs/changes/1424/head: (8 commits squashed)

  - applsit拨号盘实现：目前，滑动一下屏幕APP转动一次，后续优化为多次转动

  - 解决倒计时界面内存泄漏问题

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

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

  - 修改显示方式页面多国语言显示问题

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

  - 解决查找手表后变成长亮屏

  - 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: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>

CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1424
---

diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp
index df5b339b2..927b6d6c2 100644
--- a/code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-03-25 17:33:47
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-11-05 14:55:10
+ * @LastEditTime: 2024-11-18 19:32:15
  * @FilePath: /FD230/code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp
  * @details:实现查找手表的功能一般需要手表和智能手机之间的配合，通常是通过手机上的应用（App）或其他设备发送指令给手表，触发手表的查找功能。
  * 以下是基本的实现步骤：
@@ -39,6 +39,7 @@
 #include <cmsis_os.h>
 #include "vibrator_service.h"
 #include "../../../../../../../drivers/peripheral/utils/custom_runtime.h"
+#include <custom_utils.h>
 
 namespace OHOS
 {
@@ -304,7 +305,7 @@ namespace OHOS
     void FindWatchViewEventListener::PopInterCancelMusic(void)
     {
         // SendMsgToUIService(SCREEN_TURN_OFF_TO_UI, 0, nullptr, 0);
-        ScreenTurnOff();
+        // ScreenTurnOff();
         GraphicService::GetInstance()->PostGraphicEvent(
             std::bind(&FindWatchViewEventListener::FindWatchRingPlayStop, &FindWatchViewEventListener::GetInstance()));
     }
@@ -315,7 +316,7 @@ namespace OHOS
     void FindWatchViewEventListener::PopInterPlayMusic(const char *path)
     {
         path_ = path;
-        ScreenTurnOn(-1); // 亮屏操作
+        // ScreenTurnOn(-1); // 亮屏操作
         // 将"开启查找手表铃声"任务发布到异步线程
         GraphicService::GetInstance()->PostGraphicEvent(
             std::bind(&FindWatchViewEventListener::FindWatchRingPlayStart, &FindWatchViewEventListener::GetInstance(), path_));
@@ -454,6 +455,7 @@ namespace OHOS
 
         FindWatchViewEventListener::GetInstance().FindWatch_StartTimer(700);
         FindWatchViewEventListener::GetInstance().SetScreenBrightness();
+        ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON);
 
         NotificationManager::GetInstance()->RegisterNotifyCleanupFunction(FreeFindWatchView);
         return FindWatchGroupView;
@@ -480,6 +482,7 @@ namespace OHOS
         FindWatchViewEventListener::GetInstance().FindWatchRingPlayStop();
         FindWatchViewEventListener::GetInstance().ResumeScreenBrightness();
         FindWatchViewEventListener::GetInstance().FindWatch_StopTimer();
+        ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON);
     }
 
     /* ----------------------- FindWatchRingPlayerListener ---------------------- */