From: penglei <1624952103@qq.com> Date: Mon, 12 Aug 2024 09:13:02 +0000 (+0800) Subject: Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... X-Git-Tag: release_V1.2.70_20241020_135402~669^2^2~14 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=b271dbfe43f0ed7bca7446b1dd145a3aa0741cc3;p=mirrors%2FFD230.git Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 --- b271dbfe43f0ed7bca7446b1dd145a3aa0741cc3 diff --cc code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp index 10a873455,0e6fb0728..ad9374c7a --- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp @@@ -391,11 -388,13 +391,12 @@@ extern "C if (OHOS::ConfigModel::GetInstance()->GetDnotdisturb()) { OHOS::ConfigModel::GetInstance()->SetDnotdisturb(false); // 关闭勿扰 + SendMsgToUIService(UI_UPDATE_DNOTDISTURB_MODE,0,nullptr,0); } - if(uapi_dev_runtime_get_sleep_status() == 0) + if (uapi_dev_runtime_get_sleep_status() == 0) { - uapi_dev_runtime_set_nap_status(1); // 设置状态为小睡 - OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::WAKE); + uapi_dev_runtime_set_nap_status(1); OHOS::SleepModel::GetInstance().ReInitData(); // 更新睡眠数据 SendMsgToUIService(UI_UPDATE_SLEEP_DATA, 0, nullptr, 0); do_cywee_service_check_msg(CYWEE_SERVICE_CMD_NAP_SEDENTARY_MODE, NULL);