#，解决1110呼吸训练过程会息屏，息屏后就不震动bug

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
index 77271ca..1026321 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
@@ -112,7 +112,7 @@ static void Notify(void *args, const Topic topic, Request *request) {
   UNUSED(topic);\r
 \r
   // 训练过程中不需要判断数据准确性，不需要存储心率数据\r
-  if (uapi_dev_runtime_get_train_status() == 1 || request == NULL) {\r
+  if (uapi_dev_runtime_get_train_status() == 1 || uapi_dev_runtime_get_respiratory_training_status() || request == NULL ) {\r
     return;\r
   }\r
 \r
@@ -484,10 +484,14 @@ void HeartModel::Heart_Stop() {
     return;\r
   }\r
 \r
-  // 恢复正常亮屏\r
-  HeartModel::GetInstance()->heart_stop_screen60s_timer();\r
-  // 取消常亮屏\r
-  ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON);\r
+  //设置呼吸训练不主动息屏\r
+  if(uapi_dev_runtime_get_respiratory_training_status()!=1)\r
+  { \r
+    // 恢复正常亮屏\r
+    HeartModel::GetInstance()->heart_stop_screen60s_timer();\r
+    // 取消常亮屏\r
+    ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON);\r
+  }\r
 \r
   //设置runtime\r
   uapi_dev_runtime_set_heartrate_detect_status(0);\r
@@ -611,7 +615,7 @@ void HeartModel::SetWearStatus() {
 \r
   // 如果处于训练模式，提前返回\r
   if (uapi_dev_runtime_get_train_status() == 1 ||\r
-      uapi_dev_runtime_get_heartrate_detect_status() == 0)\r
+      uapi_dev_runtime_get_heartrate_detect_status() == 0 || uapi_dev_runtime_get_respiratory_training_status())\r
     return;\r
 \r
   unwear_counter_++;\r