From: Caisking <3449750381@qq.com> Date: Fri, 26 Jul 2024 09:32:29 +0000 (+0800) Subject: 取消训练状态下的心率存储 X-Git-Tag: release_V1.2.70_20241020_135402~730^2~20 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=8510347b1f1c7375308e0c956157d56f7b818d7f;p=mirrors%2FFD230.git 取消训练状态下的心率存储 --- 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 d3228c16c..f78e5ce39 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp @@ -13,6 +13,9 @@ #include "health_service.h" #include "custom_utils.h" #include "ppg_service.h" +#include "custom_runtime.h" +#include +#include #ifdef __cplusplus extern "C" @@ -82,6 +85,11 @@ extern "C" { UNUSED(args); UNUSED(topic); + + /*训练过程中 不需要判断数据准确性 不需要存储心率数据*/ + if (uapi_dev_runtime_get_train_status() == 1) + return; + if (request == nullptr) { return; @@ -98,7 +106,7 @@ extern "C" return; } #endif - uint16_t preheart = *(uint16_t *)request->data; + uint16_t preheart = *reinterpret_cast(request->data); // 筛选出正常数据 if (preheart > HEART_RATE_LIMIT_LOWER && preheart <= HEART_RATE_LIMIT_UPPER) { @@ -107,6 +115,7 @@ extern "C" if (heartInfo == nullptr) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[Notify] malloc fail"); + return; } heartInfo->index = index_; heartInfo->maxX = index_; @@ -623,6 +632,10 @@ namespace OHOS void HeartModel::UpHeartdata(uint16_t heart) { + /*训练过程中 不需要判断数据准确性 不需要存储心率数据*/ + if (uapi_dev_runtime_get_train_status() == 1) + return; + Show_Heart_ = heart; if (Show_Heart_ != 0) { @@ -656,7 +669,7 @@ namespace OHOS data->timestamp = HeartPresenter::GetInstance()->GetCurrentTime(); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, " Save %d %d", data->Heart, data->timestamp); SetCheckTime(data->timestamp); - HealthService::GetInstance()->UpdateHealthData(*data); + HealthService::GetInstance()->UpdateHealthData(*data); // 心率数据存储 // 关闭自动检测心率 如果有其他高级心率检测在进行,则不会进行关闭[低优先级] HeartModel::GetInstance()->Heart_Control(HeartState::End, HeartCheck::PASSIVITY); }