优化起床闹钟判断

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 15d32f5..10a8734 100644 (file)
--- 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"
             // 退出睡眠模式\r
             if (WAKE_TIME_RANGE && (uapi_dev_runtime_get_nap_status() == 0))\r
             {\r
-                //uapi_dev_runtime_set_sleep_status(0);\r
-                // do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA, NULL);\r
-                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "起床啦!");\r
+                // uapi_dev_runtime_set_sleep_status(0);\r
+                //  do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA, NULL);\r
+                WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "起床啦!");\r
                 if (curTime.tm_hour == wake_time_hour && curTime.tm_min == wake_time_min && curTime.tm_sec == 0)\r
                 {\r
+                    OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::WAKE);\r
                     // 早安提醒\r
                     AlarmEventPublish(TOPIC_EVENT_SLEEPNOTE, (uint8_t *)sleep_notify_time, 4);\r
+                    OHOS::SleepModel::GetInstance().ReInitData(); // 更新睡眠数据\r
+                    SendMsgToUIService(UI_UPDATE_SLEEP_DATA, 0, nullptr, 0);\r
                 }\r
                 if (OHOS::ConfigModel::GetInstance()->GetDnotdisturb())\r
                 {\r
                     OHOS::ConfigModel::GetInstance()->SetDnotdisturb(false); // 关闭勿扰\r
                 }\r
-                if(uapi_dev_runtime_get_sleep_status() == 0)\r
+                if (uapi_dev_runtime_get_sleep_status() == 0)\r
                 {\r
-                    uapi_dev_runtime_set_nap_status(1);\r
                     // 设置状态为小睡\r
-                    OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::WAKE);\r
+                    uapi_dev_runtime_set_nap_status(1);\r
                     OHOS::SleepModel::GetInstance().ReInitData(); // 更新睡眠数据\r
                     SendMsgToUIService(UI_UPDATE_SLEEP_DATA, 0, nullptr, 0);\r
                     do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NAP_SEDENTARY_MODE, NULL);\r