Merge #669 into sdk602patch0626 from refs/changes/669/head

优化睡眠结束判定

* refs/changes/669/head: (2 commits squashed)

  - 优化睡眠结束判定

  - 优化起床闹钟判定

Signed-off-by: aliyun6865282430 <1624952103@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/669

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..15d32f5 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,12 +377,9 @@ extern "C"
             // 退出睡眠模式\r
             if (WAKE_TIME_RANGE && (uapi_dev_runtime_get_nap_status() == 0))\r
             {\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
+                //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
-                // 设置状态为小睡\r
-                OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::WAKE);\r
                 if (curTime.tm_hour == wake_time_hour && curTime.tm_min == wake_time_min && curTime.tm_sec == 0)\r
                 {\r
                     // 早安提醒\r
@@ -392,10 +389,15 @@ extern "C"
                 {\r
                     OHOS::ConfigModel::GetInstance()->SetDnotdisturb(false); // 关闭勿扰\r
                 }\r
-                LOS_Msleep(1000);\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
+                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
+                    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
+                }\r
             }\r
             // 进入睡眠模式\r
             else if ((!WAKE_TIME_RANGE) && (uapi_dev_runtime_get_sleep_status() == 0))\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运动相关