From cd9e36e9bf987ed5c5b1d3a0a9a390a4f13bcccd Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Thu, 3 Oct 2024 17:42:34 +0800
Subject: [PATCH] =?utf8?q?#788=E6=89=8B=E8=A1=A8=EF=BC=8C=E7=9C=81?=
 =?utf8?q?=E7=94=B5=E6=A8=A1=E5=BC=8F=E4=B8=8B=EF=BC=8C=E4=BC=9A=E6=9C=89?=
 =?utf8?q?=E5=96=9D=E6=B0=B4=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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 195a336da..b9cb72340 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
@@ -494,6 +494,11 @@ extern "C"
                 do_cywee_service_check_msg(CYWEE_SERVICE_CMD_SLEEPING_MODE, NULL); // 算法底层切换睡眠监测模式
             }
         }
+
+        /*省电模式下，下方弹窗均不开启*/
+        if (uapi_dev_runtime_get_saveele_status())
+            return;
+
         // 久坐提醒
         if (sedentary_switch)
         {
@@ -567,9 +572,6 @@ extern "C"
         // 心率周期检测 [0 1 5 10]
         if (OHOS::ConfigModel::GetInstance()->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_HEARTRATE_DETECTED))
         {
-            /*省电模式下，不开启*/
-            if (uapi_dev_runtime_get_saveele_status())
-                return;
             if (curTime.tm_min % (OHOS::ConfigModel::GetInstance()->get_configData_int(OHOS::ConfigModel::CONFIGMODEL_ITEM_HEARTRATE_DETECTED)) == 0 && curTime.tm_sec == 0)
             {
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Automatic heart rate detection starts");
@@ -580,6 +582,7 @@ extern "C"
                 OHOS::HeartModel::GetInstance()->Heart_Control(OHOS::HeartState::Start, OHOS::HeartCheck::PASSIVITY);
             }
         }
+        
         int16_t curviewid = OHOS::NativeAbility::GetInstance().GetCurSliceId();
         if (curviewid != VIEW_MAIN && OHOS::PlayersView::GetInstance()) // 如果当前不在主界面且音乐界面不为空
         {
-- 
2.17.1