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