From: penglei <1624952103@qq.com>
Date: Mon, 12 Aug 2024 09:12:46 +0000 (+0800)
Subject: 优化起床闹钟判断
X-Git-Tag: release_V1.2.70_20241020_135402~669^2^2~15
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=73562b55eaf1018aeb217b11a98ddfa44a5f7c04;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 15d32f5af..10a873455 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
@@ -377,23 +377,25 @@ extern "C"
             // 退出睡眠模式
             if (WAKE_TIME_RANGE && (uapi_dev_runtime_get_nap_status() == 0))
             {
-                //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, "起床啦!");
+                // uapi_dev_runtime_set_sleep_status(0);
+                //  do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA, NULL);
+                WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "起床啦!");
                 if (curTime.tm_hour == wake_time_hour && curTime.tm_min == wake_time_min && curTime.tm_sec == 0)
                 {
+                    OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::WAKE);
                     // 早安提醒
                     AlarmEventPublish(TOPIC_EVENT_SLEEPNOTE, (uint8_t *)sleep_notify_time, 4);
+                    OHOS::SleepModel::GetInstance().ReInitData(); // 更新睡眠数据
+                    SendMsgToUIService(UI_UPDATE_SLEEP_DATA, 0, nullptr, 0);
                 }
                 if (OHOS::ConfigModel::GetInstance()->GetDnotdisturb())
                 {
                     OHOS::ConfigModel::GetInstance()->SetDnotdisturb(false); // 关闭勿扰
                 }
-                if(uapi_dev_runtime_get_sleep_status() == 0)
+                if (uapi_dev_runtime_get_sleep_status() == 0)
                 {
-                    uapi_dev_runtime_set_nap_status(1);
                     // 设置状态为小睡
-                    OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::WAKE);
+                    uapi_dev_runtime_set_nap_status(1);
                     OHOS::SleepModel::GetInstance().ReInitData(); // 更新睡眠数据
                     SendMsgToUIService(UI_UPDATE_SLEEP_DATA, 0, nullptr, 0);
                     do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NAP_SEDENTARY_MODE, NULL);