From: penglei <1624952103@qq.com>
Date: Mon, 12 Aug 2024 09:35:17 +0000 (+0800)
Subject: Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 
X-Git-Tag: release_V1.2.70_20241020_135402~669^2^2~13
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F680%2F2;p=mirrors%2FFD230.git

Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
---

2d81440c3d0840fb5b9e155a652855a491d6964f
diff --cc code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
index ad9374c7a,5640af027..c0dc84e9c
--- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
@@@ -379,14 -379,11 +379,14 @@@ extern "C
              {
                  // uapi_dev_runtime_set_sleep_status(0);
                  //  do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA, NULL);
-                 WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "起床啦!");
+                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "起床啦!");
                  if (curTime.tm_hour == wake_time_hour && curTime.tm_min == wake_time_min && curTime.tm_sec == 0)
                  {
 +                    OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::WAKE);
                      // 早安提醒
                      AlarmEventPublish(TOPIC_EVENT_SLEEPNOTE, (uint8_t *)sleep_notify_time, 4);
 +                    OHOS::SleepModel::GetInstance().ReInitData(); // 更新睡眠数据
 +                    SendMsgToUIService(UI_UPDATE_SLEEP_DATA, 0, nullptr, 0);
                  }
                  if (OHOS::ConfigModel::GetInstance()->GetDnotdisturb())
                  {