From b9a19d3081cfd4e0baed0e534ad1da0c0715d4de Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Fri, 11 Oct 2024 19:33:45 +0800
Subject: [PATCH] =?utf8?q?=E5=BF=83=E7=8E=87=EF=BC=9A=E4=B8=BB=E7=95=8C?=
 =?utf8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=BF=83=E7=8E=87=E6=9C=AA=E4=BD=A9?=
 =?utf8?q?=E6=88=B4=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../fd230app/nativeui/heartrate/src/HeartModel.cpp   |  3 +--
 .../nativeui/main/src/MainPresenterSample.cpp        | 12 ++++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

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 6ac1cb3ac..7f0f08779 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
@@ -446,8 +446,7 @@ void HeartModel::Heart_Stop() {
   displayheart = 0;
 
   /*主界面卡片检测 或者 被动检测*/
-  if (checkstate == HeartCheck::CARDCHECK ||
-      checkstate == HeartCheck::PASSIVITY) {
+  if ( checkstate == HeartCheck::PASSIVITY) {
     if (heartresult_ == HeartResult::SUCCESS) {
       Heart_Save();
       /*更新曲线*/
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
index f69dc532d..fff0cea7b 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
@@ -279,7 +279,6 @@ namespace OHOS
         /* -------------------------------------------------------------------------- */
 
         CardId cardId = view_->GetHorCurrentCard();
-        
         SetTaskPeroid(cardId);
         if (cardId == COMPASS)
         {
@@ -378,7 +377,9 @@ namespace OHOS
         if (previousCardId == HEART_RATE && currentCardId != HEART_RATE)
         {
             LogCardTransition(previousCardId, currentCardId);
-            HeartModel::GetInstance()->Heart_Control(HeartState::End, HeartCheck::CARDCHECK);
+            // HeartModel::GetInstance()->Heart_Control(HeartState::End,
+            //                                          HeartCheck::CARDCHECK);
+            HeartModel::GetInstance()->Heart_Stop();
         }
 
         // 从睡眠卡片跳转到其他卡片时切换到睡眠卡片主界面
@@ -468,8 +469,11 @@ namespace OHOS
     /*心率卡片*/
     void MainPresenterSample::StartHeartRateDetection()
     {
-        HeartModel::GetInstance()->Heart_Control(HeartState::End, HeartCheck::PASSIVITY);
-        HeartModel::GetInstance()->Heart_Control(HeartState::Start, HeartCheck::CARDCHECK);
+      // HeartModel::GetInstance()->Heart_Control(HeartState::End,
+      // HeartCheck::PASSIVITY);
+      // HeartModel::GetInstance()->Heart_Control(HeartState::Start,
+      // HeartCheck::CARDCHECK);
+      HeartModel::GetInstance()->Heart_Start();
     }
     /*主表盘*/
     void MainPresenterSample::UpdateWatchFace()
-- 
2.17.1