From: Caisking <3449750381@qq.com>
Date: Thu, 3 Oct 2024 09:42:34 +0000 (+0800)
Subject: #788手表，省电模式下，会有喝水消息提醒
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=ee0bacea26a2fe8083992af3ef09a469d712c0d3;p=mirrors%2FFD230.git

#788手表，省电模式下，会有喝水消息提醒
---

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()) // 如果当前不在主界面且音乐界面不为空
         {