From: 程羽飞 <2393524978@qq.com>
Date: Wed, 21 Aug 2024 03:09:32 +0000 (+0000)
Subject: Merge #747 into sdk602patch0626 from refs/changes/747/head
X-Git-Tag: release_V1.2.70_20241020_135402~614^2
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=80af196b99314161a32928c8a85a3c71b213b00f;p=mirrors%2FFD230.git

Merge #747 into sdk602patch0626 from refs/changes/747/head

Code review from 程羽飞

* refs/changes/747/head: (5 commits squashed)

  - 更新睡眠监测模式判别接口；优化睡眠监测模式下相关功能

  - 添加注释

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

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

  - 优化代码

Signed-off-by: dingtalk_kaxuzp <2393524978@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>

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

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
index 34f42cb0a..dee89e03e 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
@@ -322,6 +322,16 @@ extern "C"
             std::bind(AlarmTimerEventPublish, TOPIC_EVENT_ON_TIME, unuse));
     }
 
+    static void _ExitSleepModeAction(void)
+    {
+        OHOS::SleepModel::GetInstance().ExitSleepModeAction();
+    }
+
+    static void _EnterSleepModeAction(void)
+    {
+        OHOS::SleepModel::GetInstance().EnterSleepModeAction();
+    }
+
     void AlarmScan(void *arg)
     {
         struct tm curTime;
@@ -404,7 +414,7 @@ extern "C"
                     SendMsgToUIService(UI_UPDATE_SLEEP_DATA, 0, nullptr, 0);
                     do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NAP_SEDENTARY_MODE, NULL);//算法底层切换小睡监测模式
 
-                    OHOS::SleepModel::GetInstance().ExitSleepModeAction();
+                    GraphicService::GetInstance()->PostGraphicEvent(_ExitSleepModeAction);
                 }
             }
             // 进入睡眠检测模式并退出小睡检测模式
@@ -425,10 +435,10 @@ extern "C"
                     OHOS::SleepModel::GetInstance().DeleteSleepData(); // 清空前一天睡眠数据
                 }
 
-                OHOS::SleepModel::GetInstance().EnterSleepModeAction();
-
                 //LOS_Msleep(1000);
                 do_cywee_service_check_msg(CYWEE_SERVICE_CMD_SLEEPING_MODE, NULL);//算法底层切换睡眠监测模式
+
+                GraphicService::GetInstance()->PostGraphicEvent(_EnterSleepModeAction);
             }
         }
         // 久坐提醒