From: Caisking <3449750381@qq.com> Date: Sat, 12 Oct 2024 10:48:32 +0000 (+0800) Subject: #942 心率出值后,过一会又会显示-- X-Git-Tag: release_V1.2.70_20241020_135402~60^2~1^2~8 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=294416ee327886cfc6a2bf80a9644de02eb3e00d;p=mirrors%2FFD230.git #942 心率出值后,过一会又会显示-- --- 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 7f0f08779..2c17fa1c9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp @@ -29,9 +29,9 @@ extern "C" { #endif #define MAX_UNWEAR_COUNT 2 -#define MAX_VALID_HRS_COUNT 60 -#define MAX_DISVALID_HRS_COUNT 70 -#define MIN_DISPLAY_HEART 60 +#define MAX_VALID_HRS_COUNT 20 +#define MAX_DISVALID_HRS_COUNT 10 +#define MIN_DISPLAY_HEART 10 #define DISPLAY_COUNT 0 #define HEARTTEST 1 //[0 开启测试 1 关闭] @@ -401,7 +401,8 @@ void HeartModel::Heart_Control(HeartState state, HeartCheck check) { checkstate = HeartCheck::RESTSTSTE; LOS_Msleep(500); uapi_dev_runtime_set_hrs_passivity(0); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "uapi_dev_runtime_set_hrs_passivity(0)"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, + "uapi_dev_runtime_set_hrs_passivity(0)"); } else if (state == HeartState::Start && heartstate == false) { /*充电状态下不进行检测*/ bool isCharging = get_charge_stat(); // 获取充电状态 @@ -415,24 +416,20 @@ void HeartModel::Heart_Control(HeartState state, HeartCheck check) { heartstate = true; checkstate = check; //被动 - if(checkstate==HeartCheck::PASSIVITY) - { - uapi_dev_runtime_set_hrs_passivity(1); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "uapi_dev_runtime_set_hrs_passivity(1)"); + if (checkstate == HeartCheck::PASSIVITY) { + uapi_dev_runtime_set_hrs_passivity(1); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, + "uapi_dev_runtime_set_hrs_passivity(1)"); } - } } // 开始检测 void HeartModel::Heart_Start() { - displayheart = 0; - // displayheart_max=0;// 显示最大心率 [每次检测进行清除] - // displayheart_min=0;// 显示最小心率 [每次检测进行清除] - - SetResult(HeartResult::NOT_TESTED); // 重置检测 - // 进行初始化操作 if (!sensorstate) { + displayheart = 0; + SetResult(HeartResult::NOT_TESTED); // 重置检测 Heart_Control(HeartState::Start, HeartCheck::INITIATIVE); + ScreenTurnOn(60 * 1000); // 亮屏操作 600000ms 60秒关闭 sensorstate = true; } } @@ -442,11 +439,15 @@ void HeartModel::Heart_Stop() { valid_counter_ = 0; disvalid_counter_ = 0; unwear_counter_ = 0; - display_counter_ = 0; - displayheart = 0; + + // display_counter_ = 0; 取消再次检测的--操作 + // displayheart = 0; + + ScreenTurnOff(); //恢复正常亮屏 /*主界面卡片检测 或者 被动检测*/ - if ( checkstate == HeartCheck::PASSIVITY) { + if (checkstate == HeartCheck::PASSIVITY || + checkstate == HeartCheck::CARDCHECK) { if (heartresult_ == HeartResult::SUCCESS) { Heart_Save(); /*更新曲线*/ @@ -554,15 +555,14 @@ void HeartModel::Heart_Result() { break; } } - void HeartModel::SetWearStatus() - { - // 如果处于训练模式,提前返回 - if (uapi_dev_runtime_get_train_status() == 1) - return; - // 设置佩戴状态 - SetResult(HeartResult::NOT_WORN); - Heart_Stop(); - } +void HeartModel::SetWearStatus() { + // 如果处于训练模式,提前返回 + if (uapi_dev_runtime_get_train_status() == 1) + return; + // 设置佩戴状态 + SetResult(HeartResult::NOT_WORN); + Heart_Stop(); +} void HeartModel::UpHeartdata(uint16_t heart) { // 如果处于训练模式,提前返回 @@ -576,13 +576,10 @@ void HeartModel::UpHeartdata(uint16_t heart) { displayheart = 0; } display_counter_++; - } - else - { + } else { displayheart = 0; } - // 更新心率和计数器 if (displayheart != 0) { currentheart = displayheart; // 更新当前心率