From: Caisking <3449750381@qq.com>
Date: Mon, 28 Oct 2024 12:11:07 +0000 (+0800)
Subject: Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 
X-Git-Tag: fd230_release_V1.3.102~171^2~1
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=bf577ebf8472abb329cbeded7dbdcdbe9041381d;p=mirrors%2FFD230.git

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

bf577ebf8472abb329cbeded7dbdcdbe9041381d
diff --cc code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
index ca4dd2390,102632152..88566c4ea
--- 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 +112,8 @@@ static void Notify(void *args, const To
    UNUSED(topic);
  
    // 训练过程中不需要判断数据准确性，不需要存储心率数据
-   if (uapi_dev_runtime_get_train_status() == 1 || request == NULL) {
 -  if (uapi_dev_runtime_get_train_status() == 1 || uapi_dev_runtime_get_respiratory_training_status() || request == NULL ) {
++  if (uapi_dev_runtime_get_train_status() == 1 ||
++      uapi_dev_runtime_get_respiratory_training_status() || request == NULL) {
      return;
    }
  
@@@ -483,7 -483,10 +484,7 @@@ void HeartModel::Heart_Stop() 
      Heart_Control(HeartState::End, HeartCheck::PASSIVITY);
      return;
    }
-   if (sensorstate) {
 -
 -  //设置呼吸训练不主动息屏
 -  if(uapi_dev_runtime_get_respiratory_training_status()!=1)
 -  { 
++  if (sensorstate && uapi_dev_runtime_get_respiratory_training_status() != 1) {
      // 恢复正常亮屏
      HeartModel::GetInstance()->heart_stop_screen60s_timer();
      // 取消常亮屏
@@@ -611,7 -615,7 +612,8 @@@ void HeartModel::SetWearStatus() 
  
    // 如果处于训练模式，提前返回
    if (uapi_dev_runtime_get_train_status() == 1 ||
-       uapi_dev_runtime_get_heartrate_detect_status() == 0)
 -      uapi_dev_runtime_get_heartrate_detect_status() == 0 || uapi_dev_runtime_get_respiratory_training_status())
++      uapi_dev_runtime_get_heartrate_detect_status() == 0 ||
++      uapi_dev_runtime_get_respiratory_training_status())
      return;
  
    unwear_counter_++;