From 9d109a55809cbcd4fb70284cebb7580a71bd8007 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E5=BD=AD=E7=A3=8A?= <1624952103@qq.com>
Date: Sat, 10 Aug 2024 01:53:19 +0000
Subject: [PATCH] Merge #669 into sdk602patch0626 from refs/changes/669/head
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

优化睡眠结束判定

* refs/changes/669/head: (2 commits squashed)

  - 优化睡眠结束判定

  - 优化起床闹钟判定

Signed-off-by: aliyun6865282430 <1624952103@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/669
---
 .../src/AlarmClockTimerConfig.cpp             | 20 ++++++++++---------
 .../msg_center/src/msg_center_customer.cpp    |  1 +
 2 files changed, 12 insertions(+), 9 deletions(-)

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 e01a5c5c8..15d32f5af 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
@@ -377,12 +377,9 @@ extern "C"
             // 退出睡眠模式
             if (WAKE_TIME_RANGE && (uapi_dev_runtime_get_nap_status() == 0))
             {
-                uapi_dev_runtime_set_sleep_status(0);
-                uapi_dev_runtime_set_nap_status(1);
-                do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA, NULL);
+                //uapi_dev_runtime_set_sleep_status(0);
+                // do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA, NULL);
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "起床啦!");
-                // 设置状态为小睡
-                OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::WAKE);
                 if (curTime.tm_hour == wake_time_hour && curTime.tm_min == wake_time_min && curTime.tm_sec == 0)
                 {
                     // 早安提醒
@@ -392,10 +389,15 @@ extern "C"
                 {
                     OHOS::ConfigModel::GetInstance()->SetDnotdisturb(false); // 关闭勿扰
                 }
-                LOS_Msleep(1000);
-                OHOS::SleepModel::GetInstance().ReInitData(); // 更新睡眠数据
-                SendMsgToUIService(UI_UPDATE_SLEEP_DATA, 0, nullptr, 0);
-                do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NAP_SEDENTARY_MODE, NULL);
+                if(uapi_dev_runtime_get_sleep_status() == 0)
+                {
+                    uapi_dev_runtime_set_nap_status(1);
+                    // 设置状态为小睡
+                    OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::WAKE);
+                    OHOS::SleepModel::GetInstance().ReInitData(); // 更新睡眠数据
+                    SendMsgToUIService(UI_UPDATE_SLEEP_DATA, 0, nullptr, 0);
+                    do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NAP_SEDENTARY_MODE, NULL);
+                }
             }
             // 进入睡眠模式
             else if ((!WAKE_TIME_RANGE) && (uapi_dev_runtime_get_sleep_status() == 0))
diff --git a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
index c57b2be5d..1967f25d3 100644
--- a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
@@ -1258,6 +1258,7 @@ void MsgCenterNotifyInactivityAccumulateTimeProc(const Topic topic, Request* req
 #endif
     free(cywee_Inactivity_Accumulate_Time_Info);
     cywee_Inactivity_Accumulate_Time_Info = NULL;
+    uapi_dev_runtime_set_sleep_status(0);
 }
 
 //APP运动相关
-- 
2.17.1