From 490a6921dfbc7e15f5384550ca8a68e49d8a904a Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Sat, 12 Oct 2024 14:27:24 +0800
Subject: [PATCH] =?utf8?q?=E4=B8=BB=E7=95=8C=E9=9D=A2:=E4=B8=BB=E7=95=8C?=
 =?utf8?q?=E9=9D=A2=E5=BF=83=E7=8E=87=E5=8D=A1=E7=89=87=E8=84=B1=E8=85=95?=
 =?utf8?q?=E6=8F=90=E9=86=92=E4=B9=8B=E5=90=8E=E5=8F=AF=E4=BB=A5=E5=9B=9E?=
 =?utf8?q?=E5=88=B0=E4=B8=BB=E5=BF=83=E7=8E=87=E5=8D=A1=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../fd230app/nativeui/heart_blood/CheckAbnormalPresenter.cpp  | 4 ++++
 .../fd230app/nativeui/main/src/MainPresenterSample.cpp        | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalPresenter.cpp
index 2597ad3d8..e044d9f69 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/CheckAbnormalPresenter.cpp
@@ -98,6 +98,10 @@ namespace OHOS
             }
             // 回到上一个检测界面
             uint16 preSlice = NativeAbility::GetInstance().GetPreSliceId();
+            if (preSlice == VIEW_MAIN) {
+                MainModel::GetInstance().SetFromSetCardView(true);
+                MainModel::GetInstance().SetFromCardId(HEART_RATE);
+              }
             NativeAbility::GetInstance().ChangeSlice(preSlice, TransitionType::TRANSITION_ZOOM);
         }
         return true;
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 d1f5d4f17..de0be7c36 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
@@ -69,7 +69,7 @@ namespace OHOS
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "~MainPresenterSample");
         g_pMainPresenterSample = nullptr;
         /*从主界面退出，关闭心率检测*/
-        HeartModel::GetInstance()->Heart_Control(HeartState::End, HeartCheck::CARDCHECK);
+        HeartModel::GetInstance()->Heart_Control(HeartState::End, HeartCheck::INITIATIVE);
     }
 
     MainPresenterSample *MainPresenterSample::GetInstance(void)
-- 
2.17.1