From: Caisking <3449750381@qq.com>
Date: Sat, 7 Sep 2024 12:32:15 +0000 (+0800)
Subject: 修复起床闹钟不触发的BUG
X-Git-Tag: release_V1.2.70_20241020_135402~524^2~1^2~2
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=a498e0d2ed09e8f07e8045aecf7926765717ac01;p=mirrors%2FFD230.git

修复起床闹钟不触发的BUG
---

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 e34dcc86d..796a69f7e 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
@@ -161,14 +161,14 @@ extern "C"
         // 处理非跨天的情况
         if (end_min > start_min)
         {
-            if (cur_time_min >= start_min && cur_time_min <= end_min)
+            if (cur_time_min >= start_min && cur_time_min < end_min)
             {
                 return true;
             }
         }
         else // 处理跨天的情况
         {
-            if (cur_time_min >= start_min || cur_time_min <= end_min)
+            if (cur_time_min >= start_min || cur_time_min < end_min)
             {
                 return true;
             }
@@ -416,10 +416,12 @@ extern "C"
             {
                 // 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, "起床啦!");
+
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "起床啦! curTime.tm_hour:%d  curTime.tm_min:%d curTime.tm_sec:%d ",curTime.tm_hour,curTime.tm_min,curTime.tm_sec);
 
                 if (curTime.tm_hour == wake_time_hour && curTime.tm_min == wake_time_min && curTime.tm_sec == 0)
                 {
+                    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "闹铃!");
                     OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::WAKE);
                     // 早安提醒
                     AlarmEventPublish(TOPIC_EVENT_SLEEPNOTE, (uint8_t *)sleep_notify_time, 4);