From b498ebb141698c46bb1f5a6e456dd4367932312d Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Mon, 12 Aug 2024 17:12:36 +0800
Subject: [PATCH] =?utf8?q?=E8=AE=BE=E7=BD=AE=E8=AE=AD=E7=BB=83=E8=BF=87?=
 =?utf8?q?=E7=A8=8B=E4=B8=AD=E4=B8=8D=E9=9C=80=E8=A6=81=E5=BC=80=E5=90=AF?=
 =?utf8?q?=E8=A2=AB=E5=8A=A8=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../src/AlarmClockTimerConfig.cpp                   | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 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 0e6fb0728..5640af027 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
@@ -377,8 +377,8 @@ extern "C"
             // 退出睡眠模式
             if (WAKE_TIME_RANGE && (uapi_dev_runtime_get_nap_status() == 0))
             {
-                //uapi_dev_runtime_set_sleep_status(0);
-                // do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA, NULL);
+                // uapi_dev_runtime_set_sleep_status(0);
+                //  do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA, NULL);
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "起床啦!");
                 if (curTime.tm_hour == wake_time_hour && curTime.tm_min == wake_time_min && curTime.tm_sec == 0)
                 {
@@ -388,9 +388,9 @@ extern "C"
                 if (OHOS::ConfigModel::GetInstance()->GetDnotdisturb())
                 {
                     OHOS::ConfigModel::GetInstance()->SetDnotdisturb(false); // 关闭勿扰
-                    SendMsgToUIService(UI_UPDATE_DNOTDISTURB_MODE,0,nullptr,0);
+                    SendMsgToUIService(UI_UPDATE_DNOTDISTURB_MODE, 0, nullptr, 0);
                 }
-                if(uapi_dev_runtime_get_sleep_status() == 0)
+                if (uapi_dev_runtime_get_sleep_status() == 0)
                 {
                     uapi_dev_runtime_set_nap_status(1);
                     // 设置状态为小睡
@@ -419,7 +419,7 @@ extern "C"
                 if (!OHOS::ConfigModel::GetInstance()->GetDnotdisturb())
                 {
                     OHOS::ConfigModel::GetInstance()->SetDnotdisturb(true); // 开启勿扰
-                    SendMsgToUIService(UI_UPDATE_DNOTDISTURB_MODE,0,nullptr,0);
+                    SendMsgToUIService(UI_UPDATE_DNOTDISTURB_MODE, 0, nullptr, 0);
                 }
                 LOS_Msleep(1000);
                 do_cywee_service_check_msg(CYWEE_SERVICE_CMD_SLEEPING_MODE, NULL);
@@ -503,6 +503,9 @@ extern "C"
             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");
+                /*训练过程中 不需要被动检测*/
+                if (uapi_dev_runtime_get_train_status() == 1)
+                    return;
                 // 开启心率检测 如果有其他心率检测在进行，则不会进行检测[低优先级]
                 OHOS::HeartModel::GetInstance()->Heart_Control(OHOS::HeartState::Start, OHOS::HeartCheck::PASSIVITY);
             }
-- 
2.17.1