From 3a14fa17d76721a5f10c8d684cdbedf2d27a302c Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Wed, 18 Sep 2024 16:15:41 +0800
Subject: [PATCH] =?utf8?q?#704=E6=89=8B=E8=A1=A8=EF=BC=8C8=E7=82=B9?=
 =?utf8?q?=E4=BC=9A=E8=87=AA=E5=8A=A8=E5=BC=80=E5=90=AF=E7=9D=A1=E7=9C=A0?=
 =?utf8?q?=E6=A8=A1=E5=BC=8F=EF=BC=8C=E8=A1=A8=E7=9B=98=E5=92=8C=E4=B8=8B?=
 =?utf8?q?=E6=8B=89=E7=8A=B6=E6=80=81=E6=A0=8F=E4=B8=AD=E7=9D=A1=E7=9C=A0?=
 =?utf8?q?=E5=9B=BE=E6=A0=87=E6=98=BE=E7=A4=BA=E6=98=AF=E5=85=B3=E9=97=AD?=
 =?utf8?q?=E7=9A=84=EF=BC=8C=E7=82=B9=E5=87=BB=E6=9F=A5=E6=89=BE=E6=89=8B?=
 =?utf8?q?=E8=A1=A8=E5=8F=AA=E6=9C=89=E9=9C=87=E5=8A=A8=E6=B2=A1=E6=9C=89?=
 =?utf8?q?=E5=93=8D=E9=93=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp  | 7 +++++++
 .../nativeui/main/src/dropdown/DropDownCardPage1.cpp     | 9 ++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

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