修改睡眠的判断时序

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 9e5e3b9..ff51e7b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
@@ -424,8 +424,8 @@ extern "C"
           }\r
 \r
 \r
-        HandleAlarmOnTime(&curTime);\r
         HandleSleepReminder(&curTime);\r
+        HandleAlarmOnTime(&curTime);\r
         HandleMusicUpdate();\r
 \r
         //以下弹窗被控制\r
@@ -501,16 +501,6 @@ extern "C"
                     AlarmEventPublish(TOPIC_EVENT_SLEEPNOTE,  NULL, 0);  \r
                 }\r
             }\r
-            if ((curTime->tm_hour == wake_time_hour && curTime->tm_min == wake_time_min && curTime->tm_sec == 0) ||\r
-                (curTime->tm_hour == sleep_time_hour && curTime->tm_min == sleep_time_min && curTime->tm_sec == 0) && curTime->tm_min)\r
-            {\r
-                uapi_cywee_time_sync();\r
-            }\r
-            else if(!time_sync_flag && curTime->tm_min)\r
-            {\r
-                time_sync_flag = 1;\r
-                uapi_cywee_time_sync();\r
-            }\r
             // 退出睡眠检测模式并进入小睡检测模式\r
             if (!is_time_range(*curTime, sleep_time_hour, sleep_time_min, wake_time_hour, wake_time_min) && (uapi_dev_runtime_get_nap_monitoring_status() == 0))\r
             {\r
@@ -564,6 +554,16 @@ extern "C"
                 do_cywee_service_check_msg(CYWEE_SERVICE_CMD_SLEEPING_MODE, NULL); // 算法底层切换睡眠监测模式\r
                 time_sync_flag = 0;\r
             }\r
+            if ((curTime->tm_hour == wake_time_hour && curTime->tm_min == wake_time_min && curTime->tm_sec == 0) ||\r
+                (curTime->tm_hour == sleep_time_hour && curTime->tm_min == sleep_time_min && curTime->tm_sec == 0) && curTime->tm_min)\r
+            {\r
+                uapi_cywee_time_sync();\r
+            }\r
+            else if(!time_sync_flag && curTime->tm_min)\r
+            {\r
+                time_sync_flag = 1;\r
+                uapi_cywee_time_sync();\r
+            }\r
         }\r
     }\r
 \r