设置训练过程中不需要开启被动检测

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 0e6fb07..5640af0 100644 (file)
--- 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"
             // 退出睡眠模式\r
             if (WAKE_TIME_RANGE && (uapi_dev_runtime_get_nap_status() == 0))\r
             {\r
-                //uapi_dev_runtime_set_sleep_status(0);\r
-                // do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA, NULL);\r
+                // uapi_dev_runtime_set_sleep_status(0);\r
+                //  do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GET_SLEEP_DATA, NULL);\r
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "起床啦!");\r
                 if (curTime.tm_hour == wake_time_hour && curTime.tm_min == wake_time_min && curTime.tm_sec == 0)\r
                 {\r
@@ -388,9 +388,9 @@ extern "C"
                 if (OHOS::ConfigModel::GetInstance()->GetDnotdisturb())\r
                 {\r
                     OHOS::ConfigModel::GetInstance()->SetDnotdisturb(false); // 关闭勿扰\r
-                    SendMsgToUIService(UI_UPDATE_DNOTDISTURB_MODE,0,nullptr,0);\r
+                    SendMsgToUIService(UI_UPDATE_DNOTDISTURB_MODE, 0, nullptr, 0);\r
                 }\r
-                if(uapi_dev_runtime_get_sleep_status() == 0)\r
+                if (uapi_dev_runtime_get_sleep_status() == 0)\r
                 {\r
                     uapi_dev_runtime_set_nap_status(1);\r
                     // 设置状态为小睡\r
@@ -419,7 +419,7 @@ extern "C"
                 if (!OHOS::ConfigModel::GetInstance()->GetDnotdisturb())\r
                 {\r
                     OHOS::ConfigModel::GetInstance()->SetDnotdisturb(true); // 开启勿扰\r
-                    SendMsgToUIService(UI_UPDATE_DNOTDISTURB_MODE,0,nullptr,0);\r
+                    SendMsgToUIService(UI_UPDATE_DNOTDISTURB_MODE, 0, nullptr, 0);\r
                 }\r
                 LOS_Msleep(1000);\r
                 do_cywee_service_check_msg(CYWEE_SERVICE_CMD_SLEEPING_MODE, NULL);\r
@@ -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)\r
             {\r
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Automatic heart rate detection starts");\r
+                /*训练过程中 不需要被动检测*/\r
+                if (uapi_dev_runtime_get_train_status() == 1)\r
+                    return;\r
                 // 开启心率检测 如果有其他心率检测在进行，则不会进行检测[低优先级]\r
                 OHOS::HeartModel::GetInstance()->Heart_Control(OHOS::HeartState::Start, OHOS::HeartCheck::PASSIVITY);\r
             }\r