From: Caisking <3449750381@qq.com> Date: Wed, 23 Oct 2024 06:57:31 +0000 (+0800) Subject: 健康数据:增加存储宏控制 X-Git-Tag: fd230_release_V1.3.102~197 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=dd236d8a23a08cfe94e67c7aeb938d10f1d1b808;p=mirrors%2FFD230.git 健康数据:增加存储宏控制 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenModel.cpp index 1f3c2d484..586273d67 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenModel.cpp @@ -142,13 +142,16 @@ namespace OHOS // 保存检测数据 void BloodOxygenModel::Blood_Save() { - - uint32_t timestamp = BloodResultPresenter::GetInstance()->GetCurrentTime(); - SetCheckTime(timestamp); - - //HealthService::GetInstance()->UpdateHealthData(data); - HealthService::GetInstance()->send_blood_save(); - + uint32_t timestamp = BloodResultPresenter::GetInstance()->GetCurrentTime(); + SetCheckTime(timestamp); +#if MSG_SAVE_TEST + BloodOxygenData data; + data.SPO2 = currentspo2; + data.timestamp = timestamp_ms; + HealthService::GetInstance()->UpdateHealthData(data); +#else + HealthService::GetInstance()->send_blood_save(); + #endif } // 显示检测结果// 显示检测结果 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 d82e14a47..562aa350e 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 @@ -15,6 +15,7 @@ #include #define HEART_MAX_POINTS 360 +#define MSG_SAVE_TEST 1 namespace OHOS { const char *GET_HEALTH_JSON_PATH_C_STR_HEART(); 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 4aa5b9e0d..77271cae5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp @@ -502,15 +502,18 @@ void HeartModel::Heart_Stop() { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "本次心率检测结束"); } // 保存检测数据 -void HeartModel::Heart_Save() { - - uint32_t timestamp = HeartResultPresenter::GetInstance()->GetCurrentTime(); - SetCheckTime(timestamp); - - //HealthService::GetInstance()->UpdateHealthData(data); - +void HeartModel::Heart_Save(){ + +uint32_t timestamp = HeartResultPresenter::GetInstance()->GetCurrentTime(); +SetCheckTime(timestamp); +#if MSG_SAVE_TEST + HeartRateData data; + data.Heart = currentheart; + data.timestamp = timestamp_ms; + HealthService::GetInstance()->UpdateHealthData(data); +#else HealthService::GetInstance()->send_heart_save(); - +#endif //WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "保存的心率数据:%d%ld", currentheart,data.timestamp); }