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

Code review from 程羽飞

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

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

  - 添加注释

  - Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - Merge branch 'sdk602patch0626' 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>
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 34f42cb..dee89e0 100644 (file)
--- 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));\r
     }\r
 \r
+    static void _ExitSleepModeAction(void)\r
+    {\r
+        OHOS::SleepModel::GetInstance().ExitSleepModeAction();\r
+    }\r
+\r
+    static void _EnterSleepModeAction(void)\r
+    {\r
+        OHOS::SleepModel::GetInstance().EnterSleepModeAction();\r
+    }\r
+\r
     void AlarmScan(void *arg)\r
     {\r
         struct tm curTime;\r
@@ -404,7 +414,7 @@ extern "C"
                     SendMsgToUIService(UI_UPDATE_SLEEP_DATA, 0, nullptr, 0);\r
                     do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NAP_SEDENTARY_MODE, NULL);//算法底层切换小睡监测模式\r
 \r
-                    OHOS::SleepModel::GetInstance().ExitSleepModeAction();\r
+                    GraphicService::GetInstance()->PostGraphicEvent(_ExitSleepModeAction);\r
                 }\r
             }\r
             // 进入睡眠检测模式并退出小睡检测模式\r
@@ -425,10 +435,10 @@ extern "C"
                     OHOS::SleepModel::GetInstance().DeleteSleepData(); // 清空前一天睡眠数据\r
                 }\r
 \r
-                OHOS::SleepModel::GetInstance().EnterSleepModeAction();\r
-\r
                 //LOS_Msleep(1000);\r
                 do_cywee_service_check_msg(CYWEE_SERVICE_CMD_SLEEPING_MODE, NULL);//算法底层切换睡眠监测模式\r
+\r
+                GraphicService::GetInstance()->PostGraphicEvent(_EnterSleepModeAction);\r
             }\r
         }\r
         // 久坐提醒\r