睡眠：修复开启睡眠会点亮勿扰icon

diff --git a/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbModel.cpp
index 1818c8f..6b398cd 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/dnotdisturb/src/DnotDisturbModel.cpp
@@ -34,10 +34,10 @@ namespace OHOS
 
     bool DnotDisturbModel::GetDoNotDisturbModeEnabled() const
     {
-        if(uapi_sleep_mode_flag_get())
-        {
-            return true;
-        }
+        // if(uapi_sleep_mode_flag_get())
+        // {
+        //     return true;
+        // }
 
         return ConfigModel::GetInstance()->GetDnotdisturb();
     }

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 4c4d6fb..3ad2db5 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
@@ -128,7 +128,7 @@ namespace OHOS
             if (uapi_sleep_mode_flag_get())
             {
                 state = toggleButton[DropDownCardPage1::toggleButton_SLEEP]->GetState();
-                UpdateSleepModelState(state);
+                // UpdateSleepModelState(state);
                 SleepModeModel::GetInstance().SetSleepModeDisabled();
                 // state = toggleButton[DropDownCardPage1::toggleButton_DNOTDISTURB]->GetState();
                 // UpdateDnotdisturbState(DnotDisturbModel::GetInstance().GetDoNotDisturbModeEnabled());
@@ -140,10 +140,10 @@ namespace OHOS
         }
         else if (viewId == DROPDOWN_DNOTDISTURB_TOGGLEBUTTON_VIEWID) // 勿扰开关
         {
-            if (uapi_sleep_mode_flag_get())
-            {
-                return true;
-            }
+            // if (uapi_sleep_mode_flag_get())
+            // {
+            //     return true;
+            // }
 
             if (DnotDisturbModel::GetInstance().GetDoNotDisturbModeEnabled() == false)
             {
@@ -292,11 +292,11 @@ namespace OHOS
             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);
-        }
+        // //勿扰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