From ebd7d787422f8258f6a28c957c95aeca552fb371 Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Wed, 31 Jul 2024 17:09:21 +0800
Subject: [PATCH] =?utf8?q?=E5=90=8C=E6=AD=A5=E4=B8=BB=E7=95=8C=E9=9D=A2?=
 =?utf8?q?=E5=BF=83=E7=8E=87=E6=95=B0=E6=8D=AE=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../fd230app/nativeui/heartrate/include/HeartModel.h        | 1 +
 .../wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp | 6 ++++++
 .../fd230app/nativeui/main/src/MainPresenterSample.cpp      | 6 +++---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartModel.h b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartModel.h
index c2d83efc3..5a453a310 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartModel.h
@@ -85,6 +85,7 @@ extern "C"
         {
             RESTSTSTE = 0, // 未检测状态
             PASSIVITY,     // 被动检测心率
+            CARDCHECK,     // 卡片检测
             INITIATIVE,    // 主动检测心率
             EXERCISE,      // 运动心率
         };
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 8226b2099..04355da03 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
@@ -558,6 +558,12 @@ namespace OHOS
         disvalid_counter_ = 0;
         unwear_counter_ = 0;
 
+        /*主界面卡片检测 或者 被动检测*/
+        if (checkstate == HeartCheck::CARDCHECK || checkstate == HeartCheck::PASSIVITY)
+        {
+            Heart_Save();
+        }
+
         if (sensorstate)
         {
             Heart_Control(HeartState::End, HeartCheck::INITIATIVE);
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 c4f1239b7..2e7120152 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
@@ -46,7 +46,7 @@ namespace OHOS
         {DROPDOWN_CLICK_DNOTDISTURB, VIEW_DNOTDISTURB},     // 勿扰
         {DROPDOWN_CLICK_SAVEELE, VIEW_NETWORKANDCALL},      // 4G
         {DROPDOWN_CLICK_FINDMYPHONE, VIEW_MAIN_ALIPAY},     // 支付宝
-        {MAIN_CLICK_BLOOD, VIEW_BLOODOXY_CHECK},            // 血氧检查
+        {MAIN_CLICK_BLOOD, VIEW_BLOOD_CHECK},               // 血氧检查
         {MAIN_CLICK_SETCARD, VIEW_ADD_CARD},                // 卡片管理
     };
 
@@ -368,7 +368,7 @@ namespace OHOS
         if (previousCardId == HEART_RATE && cardId != HEART_RATE)
         {
             // 从心率卡片变为其他卡片时调用关闭心率检测的函数
-            HeartModel::GetInstance()->Heart_Control(HeartState::End, HeartCheck::INITIATIVE);
+            HeartModel::GetInstance()->Heart_Control(HeartState::End, HeartCheck::CARDCHECK);
         }
 
         // 更新上一个卡片的值
@@ -379,7 +379,7 @@ namespace OHOS
         case HEART_RATE:
             // 开启心率检测 [UI优先级最高直接打断正在检测 重新检测]
             HeartModel::GetInstance()->Heart_Control(HeartState::End, HeartCheck::PASSIVITY);
-            HeartModel::GetInstance()->Heart_Control(HeartState::Start, HeartCheck::INITIATIVE);
+            HeartModel::GetInstance()->Heart_Control(HeartState::Start, HeartCheck::CARDCHECK);
             break;
 
         case COMPASS:
-- 
2.17.1