From: Caisking <3449750381@qq.com> Date: Sat, 12 Oct 2024 10:49:52 +0000 (+0800) Subject: #840 卡片界面心率也需要有活体检测弹窗提醒 X-Git-Tag: release_V1.2.70_20241020_135402~60^2~1^2~7 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=b57c8d32d46e3b23bbeacd5867bec4aa3c40ad8c;p=mirrors%2FFD230.git #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 de0be7c36..21ec2c85e 100644 --- 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()