From a6f8434fa56c2581087a374d9596118d30b4ba53 Mon Sep 17 00:00:00 2001
From: penglei <1624952103@qq.com>
Date: Fri, 9 Aug 2024 20:01:54 +0800
Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96=E8=B5=B7=E5=BA=8A=E9=97=B9?=
 =?utf8?q?=E9=92=9F=E5=88=A4=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../src/AlarmClockTimerConfig.cpp              | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 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 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))
-- 
2.17.1