解决呼吸训练没有心率测量bug

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingModel.cpp
index 044b28e..2aa86f3 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingModel.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingModel.cpp
@@ -24,9 +24,7 @@
 #include <thread>
 #include <unordered_map>
 #include <custom_runtime.h>
-#ifdef FD230_650
 #include "heartrate/include/HeartModel.h"
-#endif
 namespace OHOS
 {
     // 声明定时器变量
@@ -134,7 +132,6 @@ namespace OHOS
         }
         lastCallTime = currentTime; // 更新最后调用时间
 
-#ifdef FD230_650
         uint16_t heartrate = HeartModel::GetInstance()->GetShowHeartdata();
 
         if (heartrate != 0)
@@ -144,16 +141,13 @@ namespace OHOS
             count++;
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "heartTotal = %0.f,count = %d,h_rate = %d", heartTotal, count, heartrate);
         }
-#endif
     }
 
     void RespiratoryTrainingModel::ResumeStatus()
     {
         heartTotal = 0;
         count = 0;
-#ifdef FD230_650
         HeartModel::GetInstance()->Heart_Control(HeartState::End, HeartCheck::INITIATIVE); // 关闭心率检测
-#endif
         uapi_dev_runtime_set_respiratory_training_status(0); // 如果直接退出也要设置为0
     }
     /* -------------------------------------------------------------------------- */
@@ -170,9 +164,7 @@ namespace OHOS
         RespiratoryTrainingModel::GetInstance().RT_StopTimer();                // 停止定时器
         RespiratoryTrainingModel::GetInstance().AddRespiratoryTrainingTimes(); // 呼吸训练次数加1
         p_RespiratoryTrainingView->GetRespiratoryTrainingAnimator_()->Stop();  // 关闭呼吸动画
-#ifdef FD230_650
         HeartModel::GetInstance()->Heart_Control(HeartState::End, HeartCheck::INITIATIVE); // 关闭心率检测
-#endif
         p_RespiratoryTrainingView->ChangeView(RESPIRATORYTRAINING, RESPIRATORYTRAININGCOMPLETED);
         ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON); /*取消常亮屏*/
         return;

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingView.cpp
index da1366d..b0f8ef0 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/respiratorytraining/src/RespiratoryTrainingView.cpp
@@ -242,9 +242,7 @@ namespace OHOS
         ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON);            // 开始训练后常亮屏
         uapi_dev_runtime_set_respiratory_training_status(1); // 训练开始runtime设置为1
         StartRespiratoryTraining();                          // 开始呼吸训练
-#ifdef FD230_650
         HeartModel::GetInstance()->Heart_Control(HeartState::Start, HeartCheck::INITIATIVE); // 开启心率检测
-#endif
         RespiratoryTrainingModel::GetInstance().RT_StartTimer(RespiratoryTrainingModel::GetInstance().GetRespiratoryTrainingTime()); // 开启定时器
         custom_VibratorFunc_int(0);                                                                                                  // 震动
     }