From: penglei <1624952103@qq.com>
Date: Fri, 9 Aug 2024 12:01:54 +0000 (+0800)
Subject: 优化起床闹钟判定
X-Git-Tag: release_V1.2.70_20241020_135402~669^2^2~19
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F669%2Fhead;p=mirrors%2FFD230.git

优化起床闹钟判定
---

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 a939a1feb..15d32f5af 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
@@ -375,14 +375,11 @@ extern "C"
                 }
             }
             // 退出睡眠模式
-            if (WAKE_TIME_RANGE && (uapi_dev_runtime_get_nap_status() == 0) && (uapi_dev_runtime_get_sleep_status() == 0))
+            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);
                 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))