#840 卡片界面心率也需要有活体检测弹窗提醒

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 de0be7c..21ec2c8 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
@@ -42,6 +42,8 @@
 #include "ui_service.h"
 #include "time.h"
 #define TESTCHECK 0
+//心率弹窗
+#define HEART_RATE_CHECK_TIMEOUT 0
 namespace OHOS
 {
 
@@ -69,7 +71,13 @@ namespace OHOS
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "~MainPresenterSample");
         g_pMainPresenterSample = nullptr;
         /*从主界面退出，关闭心率检测*/
-        HeartModel::GetInstance()->Heart_Control(HeartState::End, HeartCheck::INITIATIVE);
+#if HEART_RATE_CHECK_TIMEOUT
+      HeartModel::GetInstance()->Heart_Control(HeartState::End,
+                                               HeartCheck::CARDCHECK);
+#else
+      HeartModel::GetInstance()->Heart_Control(HeartState::End,
+                                               HeartCheck::INITIATIVE);
+#endif
     }
 
     MainPresenterSample *MainPresenterSample::GetInstance(void)
@@ -470,9 +478,11 @@ namespace OHOS
     {
       // HeartModel::GetInstance()->Heart_Control(HeartState::End,
       // HeartCheck::PASSIVITY);
-      // HeartModel::GetInstance()->Heart_Control(HeartState::Start,
-      // HeartCheck::CARDCHECK);
-      HeartModel::GetInstance()->Heart_Start();
+#if HEART_RATE_CHECK_TIMEOUT
+    HeartModel::GetInstance()->Heart_Control(HeartState::Start,HeartCheck::CARDCHECK);
+#else
+    HeartModel::GetInstance()->Heart_Start();
+#endif
     }
     /*主表盘*/
     void MainPresenterSample::UpdateWatchFace()