From: Caisking <3449750381@qq.com> Date: Wed, 23 Oct 2024 02:06:13 +0000 (+0800) Subject: #994 心率界面检测显示有全天心率数据(最大值 ,最小值 )手表重启后,最大值 ,最小值消失显示为-- X-Git-Tag: fd230_release_V1.3.102~201 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=128fb1dfb02d4a68a77692c0c6291277a2e6687c;p=mirrors%2FFD230.git #994 心率界面检测显示有全天心率数据(最大值 ,最小值 )手表重启后,最大值 ,最小值消失显示为-- --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp index 595885fac..85786f170 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp @@ -16,19 +16,26 @@ namespace OHOS { - extern "C" - { - void uapi_dev_runtime_set_bloodoxygen_storage_status(uint8_t status); - void uapi_dev_runtime_set_heartrate_storage_status(uint8_t status); - - void save_heart_data() - { - printf("save_heart_data\r\n"); - OHOS::HealthService::GetInstance()->SaveDailyHeartRate(); - return; - } - } +extern "C" { +void uapi_dev_runtime_set_bloodoxygen_storage_status(uint8_t status); +void uapi_dev_runtime_set_heartrate_storage_status(uint8_t status); + +void save_heart_data() { + printf("save_heart_data\r\n"); + OHOS::HealthService::GetInstance()->SaveDailyHeartRate(); + return; +} + +void save_heart_maxmin() { + printf("save_heart_maxmin\r\n"); + uint16_t max_heart_data = OHOS::HeartModel::GetInstance()->GetShowMaxHeartdata(); + uint16_t min_heart_data = OHOS::HeartModel::GetInstance()->GetShowMinHeartdata(); + OHOS::HealthService::GetInstance()->SaveHeartMaxMin(max_heart_data, + min_heart_data); + return; +} +} static HealthService *g_pHealthService = nullptr; /*获取日期*/ std::string GetCurrentDate() { @@ -574,7 +581,58 @@ bool HealthService::CreateHealthFolder() { } // 获取当前小时 - uint16_t HealthService::GetCurrentHour() { - return currenthour; - } + uint16_t HealthService::GetCurrentHour() { return currenthour; } + /* + 心率最大最小值存储 + 关机存储 +*/ +#define HEART_MAX_MIN_PATH "/user/userdata/health/heart_max_min.bin" +// 保存最大最小值 +bool HealthService::SaveHeartMaxMin(uint16_t max, uint16_t min) { + std::ofstream outFile(HEART_MAX_MIN_PATH, std::ios::binary | std::ios::trunc); + if (!outFile.is_open()) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Failed to open file"); + return false; + } + + outFile.write(reinterpret_cast(&max), sizeof(max)); + if (!outFile) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Failed to write max value"); + return false; + } + + outFile.write(reinterpret_cast(&min), sizeof(min)); + if (!outFile) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Failed to write min value"); + return false; + } + + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SaveHeartMaxMin is ok max %d, min %d", + max, min); + return true; +} +// 加载最大最小值 +void HealthService::LoadHeartMaxMin(uint16_t &max, uint16_t &min) { + std::ifstream inFile(HEART_MAX_MIN_PATH, std::ios::binary); + if (!inFile.is_open()) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Failed to open file %s", + HEART_MAX_MIN_PATH); + return; + } + + inFile.read(reinterpret_cast(&max), sizeof(max)); + if (!inFile) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Failed to read max value"); + return; + } + + inFile.read(reinterpret_cast(&min), sizeof(min)); + if (!inFile) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Failed to read min value"); + return; + } + + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LoadHeartMaxMin is ok max %d, min %d", + max, min); +} } // namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.h b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.h index 7aa6a0792..e062f5c1f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.h +++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.h @@ -93,6 +93,8 @@ namespace OHOS void ClearHourlyHeartRates(); uint16_t GetCurrentHour(); + bool SaveHeartMaxMin(uint16_t max, uint16_t min); + void LoadHeartMaxMin(uint16_t &max, uint16_t &min); private: static const int MAX_HOURS = 24; 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 bbdfd0ead..013ef4b06 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp @@ -70,6 +70,7 @@ Subscriber heartSubscirber = { }; static void ProcessHeartRateUpdate(Request *request); static void RefreshHeartData(); +void save_heart_maxmin(); void HeartDataSubscribeTopic(Topic topic) { BroadcastApi *broadcastApi = nullptr; IUnknown *api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, @@ -219,6 +220,9 @@ HeartModel::HeartModel() { currentheart = 0; timestamp_ms = 0; } + //读取最大最小值 + HealthService::GetInstance()->LoadHeartMaxMin(displayheart_max, + displayheart_min); // 配置动态数组 SetArrayData(); } @@ -668,11 +672,11 @@ void HeartModel::UpHeartdata(uint16_t heart) { } // 检查无效计数器是否达标 - if(uapi_dev_runtime_get_sleep_monitoring_status()) //睡眠监测模式下,增加未佩戴个数最大值,避免误判 - max_valid_count = MAX_DISVALID_HRS_COUNT * 2; + if (uapi_dev_runtime_get_sleep_monitoring_status()) //睡眠监测模式下,增加未佩戴个数最大值,避免误判 + max_valid_count = MAX_DISVALID_HRS_COUNT * 2; else - max_valid_count = MAX_DISVALID_HRS_COUNT; - + max_valid_count = MAX_DISVALID_HRS_COUNT; + if (disvalid_counter_ >= max_valid_count) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "检测结果:无效数达标 disvalid_counter:%d", disvalid_counter_); diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c index 0a3ebde0b..b9a00e22e 100644 --- a/code/sdk/drivers/peripheral/utils/custom_utils.c +++ b/code/sdk/drivers/peripheral/utils/custom_utils.c @@ -217,6 +217,7 @@ void shutdown_reboot_prejobs_task(void) saveancsdata(); //接收到信息进行保存 暂时不修改 //保存当天心率数据 // save_heart_data();//测量完成保存 + save_heart_maxmin();//存储最大最小状态值 //表盘配置 // dial_file_save();