优化睡眠结束判定

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 e01a5c5..a939a1f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
@@ -375,11 +375,11 @@ extern "C"
                 }\r
             }\r
             // 退出睡眠模式\r
-            if (WAKE_TIME_RANGE && (uapi_dev_runtime_get_nap_status() == 0))\r
+            if (WAKE_TIME_RANGE && (uapi_dev_runtime_get_nap_status() == 0) && (uapi_dev_runtime_get_sleep_status() == 0))\r
             {\r
-                uapi_dev_runtime_set_sleep_status(0);\r
+                //uapi_dev_runtime_set_sleep_status(0);\r
                 uapi_dev_runtime_set_nap_status(1);\r
-                do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA, NULL);\r
+                // do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA, NULL);\r
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "起床啦!");\r
                 // 设置状态为小睡\r
                 OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::WAKE);\r

diff --git a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
index c57b2be..1967f25 100644 (file)
--- a/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
+++ b/code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
@@ -1258,6 +1258,7 @@ void MsgCenterNotifyInactivityAccumulateTimeProc(const Topic topic, Request* req
 #endif
     free(cywee_Inactivity_Accumulate_Time_Info);
     cywee_Inactivity_Accumulate_Time_Info = NULL;
+    uapi_dev_runtime_set_sleep_status(0);
 }
 
 //APP运动相关