From: Caisking Date: Sat, 19 Jul 2025 02:39:48 +0000 (+0800) Subject: 修复周期检测心率不停止的bug X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~210^2~24 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=b4b76bab21a385358752d98f0660d2298723d7ac;p=mirrors%2FFD230.git 修复周期检测心率不停止的bug --- diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp index a2216b6f4..22d65b3b7 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp @@ -653,7 +653,7 @@ extern "C" WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Heart rate detection cycle detection is enabled %d", curTime->tm_min % heartRateDetectionInterval); if (curTime->tm_min % heartRateDetectionInterval == 0 && curTime->tm_sec == 0) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Automatic heart rate detection starts"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "开启心率周期检测"); // 开启心率检测 OHOS::HeartModel::GetInstance()->Heart_Control(OHOS::HeartState::Start, OHOS::HeartCheck::PASSIVITY); } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartModel.cpp index 1eeb5eb69..fbc80a6fc 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartModel.cpp @@ -30,7 +30,12 @@ #include #include "MainClockView.h" -// #include + +#ifdef BLE_SERVER_ENABLE +#include "bleEvent.h" +#include "bleInstruct.h" +#include "bleService.h" +#endif #include #include @@ -199,7 +204,8 @@ void HeartModel::ClearHeartData(void) { } SetAveHeartRateCount(0); // GraphicService::GetInstance()->PostGraphicEvent( - // std::bind(&HeartModel::RefreshHeartRateScreen, HeartModel::GetInstance(), + // std::bind(&HeartModel::RefreshHeartRateScreen, + // HeartModel::GetInstance(), // healthDatas.heartRatePerSec, healthDatas.heartRateRest, // healthDatas.heartRateMax.y, healthDatas.heartRateMin.y)); } @@ -333,7 +339,8 @@ void HeartModel::HeartRatePros(HeartDatas *heartInfo) { } // GraphicService::GetInstance()->PostGraphicEvent( - // std::bind(&HeartModel::RefreshHeartRateScreen, HeartModel::GetInstance(), + // std::bind(&HeartModel::RefreshHeartRateScreen, + // HeartModel::GetInstance(), // healthDatas.heartRatePerSec, healthDatas.heartRateRest, // healthDatas.heartRateMax.y, healthDatas.heartRateMin.y)); } @@ -470,6 +477,7 @@ void HeartModel::Heart_Control(HeartState state, HeartCheck check) { uapi_save_runtime_log(RUNTIME_LOG_HEART_MEASURE); } #endif + heart_data_timer(); // 开始检测 } } // 开始检测 @@ -488,7 +496,6 @@ void HeartModel::Heart_Start(HeartCheck check) { // 主动检测的亮屏60s heart_start_screen60s_timer(); } - heart_data_timer(); // 开始检测 } } @@ -508,6 +515,7 @@ void HeartModel::Heart_Stop() { } /*关闭被动检测*/ Heart_Control(HeartState::End, HeartCheck::PASSIVITY); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "结束周期心率检测"); return; } //呼吸训练模式下不进行息屏与保存