Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...

diff --cc code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
index ca4dd23,1026321..88566c4
--- 1/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
--- 2/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 +112,8 @@@ static void Notify(void *args, const To
    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
++  if (uapi_dev_runtime_get_train_status() == 1 ||\r
++      uapi_dev_runtime_get_respiratory_training_status() || request == NULL) {\r
      return;\r
    }\r
  \r
@@@ -483,7 -483,10 +484,7 @@@ void HeartModel::Heart_Stop() 
      Heart_Control(HeartState::End, HeartCheck::PASSIVITY);\r
      return;\r
    }\r
-   if (sensorstate) {\r
 -\r
 -  //设置呼吸训练不主动息屏\r
 -  if(uapi_dev_runtime_get_respiratory_training_status()!=1)\r
 -  { \r
++  if (sensorstate && uapi_dev_runtime_get_respiratory_training_status() != 1) {\r
      // 恢复正常亮屏\r
      HeartModel::GetInstance()->heart_stop_screen60s_timer();\r
      // 取消常亮屏\r
@@@ -611,7 -615,7 +612,8 @@@ 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
++      uapi_dev_runtime_get_heartrate_detect_status() == 0 ||\r
++      uapi_dev_runtime_get_respiratory_training_status())\r
      return;\r
  \r
    unwear_counter_++;\r