#704手表，8点会自动开启睡眠模式，表盘和下拉状态栏中睡眠图标显示是关闭的，点击查找手表只有震动没有响铃

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 6f5e123..285615a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
@@ -28,6 +28,7 @@
 #include "ConfigModel.h"\r
 #include "heartrate/include/HeartModel.h"\r
 #include "sleep/include/SleepModel.h"\r
+#include "sleepmode/include/SleepModeModel.h"\r
 #include "safemodemanager/include/SafeModeManagerModel.h"\r
 #include "cat1_server_hal.h"\r
 #include "custom_runtime.h"\r
@@ -425,6 +426,8 @@ extern "C"
                 if (curTime.tm_hour == wake_time_hour && curTime.tm_min == wake_time_min && curTime.tm_sec == 0)\r
                 {\r
                     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "闹铃!");\r
+                    //退出睡眠模式\r
+                    OHOS::SleepModeModel::GetInstance().SetSleepModeDisabled();\r
                     OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::WAKE);\r
                     // 早安提醒（关闭）\r
                     // AlarmEventPublish(TOPIC_EVENT_SLEEPNOTE, (uint8_t *)sleep_notify_time, 4);\r
@@ -460,12 +463,16 @@ extern "C"
                 OHOS::create_sleep_folder();                     // 创建睡眠文件夹              \r
                 set_keep_in_wear_det_mode(0);                       \r
                 do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA, &cmd); // 强制获取小睡数据，结束小睡\r
+\r
                 // 睡眠弹窗\r
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "要睡觉啦!");\r
                 // 设置状态为睡眠\r
                 OHOS::SleepModel::GetInstance().set_sleep_state(OHOS::SLEEPSTATE::SLEPP);\r
+                \r
                 if (curTime.tm_hour == sleep_time_hour && curTime.tm_min == sleep_time_min && curTime.tm_sec == 0)\r
                 {\r
+                    //进入睡眠模式\r
+                    OHOS::SleepModeModel::GetInstance().SetSleepModeEnabled();\r
                     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "要睡觉啦!");\r
                     AlarmEventPublish(TOPIC_EVENT_SLEEPNOTE, (uint8_t *)sleep_notify_time, 4);\r
                     OHOS::SleepModel::GetInstance().DeleteSleepData(); // 清空前一天睡眠数据\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp
index 87d6060..1c5a8c2 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp
@@ -126,7 +126,7 @@ namespace OHOS
                 UpdateSleepModelState(state);
                 SleepModeModel::GetInstance().SetSleepModeDisabled();
                 // state = toggleButton[DropDownCardPage1::toggleButton_DNOTDISTURB]->GetState();
-                UpdateDnotdisturbState(DnotDisturbModel::GetInstance().GetDoNotDisturbModeEnabled());
+                // UpdateDnotdisturbState(DnotDisturbModel::GetInstance().GetDoNotDisturbModeEnabled());
             }
             else
             {
@@ -281,10 +281,17 @@ namespace OHOS
     // 更新睡眠模式开关
     void DropDownCardPage1::UpdateSleepModelState(bool state)
     {
+        //睡眠icon
         if (toggleButton[DropDownCardPage1::toggleButton_SLEEP] != nullptr)
         {
             const char *ImageSrc = state ? DROPDOWN_SLEEP_ON_IMAGE : DROPDOWN_SLEEP_OFF_IMAGE;
             toggleButton[DropDownCardPage1::toggleButton_SLEEP]->SetImages(ImageSrc, ImageSrc);
         }
+        //勿扰icon
+        if (toggleButton[DropDownCardPage1::toggleButton_DNOTDISTURB] != nullptr)
+        {
+            const char *ImageSrc = state ? DROPDOWN_DNOTDISTURB_ON_IMAGE : DROPDOWN_DNOTDISTURB_OFF_IMAGE;
+            toggleButton[DropDownCardPage1::toggleButton_DNOTDISTURB]->SetImages(ImageSrc, ImageSrc);
+        }
     }
 }
\ No newline at end of file