From 23c5879417e56f43654f2f55c68363f51b7b705a Mon Sep 17 00:00:00 2001 From: Caisking Date: Sat, 24 May 2025 11:23:28 +0800 Subject: [PATCH] =?utf8?q?=E5=A2=9E=E5=8A=A0PPGService?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeui/bloodoxygen/src/BloodOxygenModel.cpp | 4 ++-- .../nativeui/heart_blood/CheckInvalidPresenter.cpp | 2 +- .../nativeapp/nativeui/heartrate/src/HeartModel.cpp | 12 ++++++------ code/sdk/build/config/target_config/brandy/config.py | 2 +- code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp | 12 ++++++------ code/sdk/zhihui/drivers/cywee/dml/main_dml.c | 8 ++++---- .../factorytest_service/factorytest_protocol.c | 4 ++-- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodOxygenModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodOxygenModel.cpp index 3fd1bcdee..7abcf4bd5 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodOxygenModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodOxygenModel.cpp @@ -72,7 +72,7 @@ namespace OHOS { // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "startspo2 End"); // uint16_t md = PPG_SERVICE_CMD_TYPE_STOP_SPO2_TEST; -#ifdef SUPORT_PPG_SERVICE +#ifdef SUPPORT_PPG_SERVICE // send_ppg_cmd_msg(md); #endif // startspo2 = false; @@ -90,7 +90,7 @@ namespace OHOS // } // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "startspo2 Start"); // uint16_t md = PPG_SERVICE_CMD_TYPE_DO_SPO2_TEST; -#ifdef SUPORT_PPG_SERVICE +#ifdef SUPPORT_PPG_SERVICE // send_ppg_cmd_msg(md); #endif // startspo2 = true; diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidPresenter.cpp index 39e3162b8..29b86d1b0 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidPresenter.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidPresenter.cpp @@ -38,7 +38,7 @@ #include #include -#ifdef SUPORT_PPG_SERVICE +#ifdef SUPPORT_PPG_SERVICE #include "ppg_service.h" #endif 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 0e77b2952..8abe2a0e5 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 @@ -18,7 +18,7 @@ #include "heart_blood/health_service/health_service.h" -#ifdef SUPORT_PPG_SERVICE +#ifdef SUPPORT_PPG_SERVICE #include "ppg_service.h" #endif @@ -44,7 +44,7 @@ #include #include -// #include "battery_hal.h" +#include "battery_hal.h" #include "languagecode/LanguageInit.h" #include "ui_service.h" @@ -395,7 +395,7 @@ void HeartModel::SetResult(HeartResult result) { heartresult_ = result; } HeartResult HeartModel::GetResult() { return heartresult_; } // 控制心率检测 void HeartModel::Heart_Control(HeartState state, HeartCheck check) { - #ifdef SUPORT_PPG_SERVICE + //优先级低不对高优先级处理 if (check < checkstate) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, @@ -422,8 +422,8 @@ void HeartModel::Heart_Control(HeartState state, HeartCheck check) { unwear_counter_ = 0; display_counter_ = 0; displayheart = 0; +#ifdef SUPPORT_PPG_SERVICE uint8_t md = PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST; -#ifdef SUPORT_PPG_SERVICE errcode_t ret = send_ppg_cmd_msg(md); if(ret != ERRCODE_SUCC) { @@ -454,7 +454,7 @@ void HeartModel::Heart_Control(HeartState state, HeartCheck check) { return; } WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartState Start"); -#ifdef SUPORT_PPG_SERVICE +#ifdef SUPPORT_PPG_SERVICE uint8_t md = PPG_SERVICE_CMD_TYPE_DO_PPG_TEST; send_ppg_cmd_msg(md); #endif @@ -468,7 +468,7 @@ void HeartModel::Heart_Control(HeartState state, HeartCheck check) { uapi_save_runtime_log(RUNTIME_LOG_HEART_MEASURE); } } - #endif + } // 开始检测 void HeartModel::Heart_Start(HeartCheck check) { diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py index 88d33de6f..4aab42ded 100644 --- a/code/sdk/build/config/target_config/brandy/config.py +++ b/code/sdk/build/config/target_config/brandy/config.py @@ -398,7 +398,7 @@ target = { "custom_config", "rotary_encoder", "nativelauncher", - #"ppg_service", + "ppg_service", #"cywee_service", "batterry_service", "bleservice", diff --git a/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp b/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp index e6364e2d0..37eba8135 100644 --- a/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp @@ -109,7 +109,7 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%s",buf); label_hrsenson_value_vison->SetText(buf); RootView::GetInstance()->Invalidate(); -#ifdef SUPORT_PPG_SERVICE +#ifdef SUPPORT_PPG_SERVICE int8_t md = PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST; send_ppg_cmd_msg(md); #endif @@ -127,7 +127,7 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%s",buf); label_hrsenson_value_vison->SetText(buf); RootView::GetInstance()->Invalidate(); -#ifdef SUPORT_PPG_SERVICE +#ifdef SUPPORT_PPG_SERVICE int8_t md = PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST; send_ppg_cmd_msg(md); #endif @@ -140,7 +140,7 @@ namespace OHOS uint32_t apre_val = 0; uint32_t aps_val = 9; vc9202_get_leaklight_data(&led_cur,&apre_val,&aps_val); -#ifdef SUPORT_PPG_SERVICE +#ifdef SUPPORT_PPG_SERVICE send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST); #endif sprintf(buf,"leaklight:\ngreen:%d\nred:%d\nir:%d",led_cur,apre_val,aps_val); @@ -189,7 +189,7 @@ namespace OHOS { if(button_1!=NULL) { -#ifdef SUPORT_PPG_SERVICE +#ifdef SUPPORT_PPG_SERVICE int8_t md = PPG_SERVICE_CMD_TYPE_DO_GRAYCARD_TEST; send_ppg_cmd_msg(md); #endif @@ -201,7 +201,7 @@ namespace OHOS { if(button_2!=NULL) { -#ifdef SUPORT_PPG_SERVICE +#ifdef SUPPORT_PPG_SERVICE int8_t md = PPG_SERVICE_CMD_TYPE_DO_LEAKLIGHT_TEST; send_ppg_cmd_msg(md); #endif @@ -332,7 +332,7 @@ namespace OHOS testhrsensonScrollView->SetTouchable(true); testhrsensonScrollView->SetDraggable(true); -#ifdef SUPORT_PPG_SERVICE +#ifdef SUPPORT_PPG_SERVICE int8_t md = PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST; send_ppg_cmd_msg(md); #endif diff --git a/code/sdk/zhihui/drivers/cywee/dml/main_dml.c b/code/sdk/zhihui/drivers/cywee/dml/main_dml.c index 971c0060d..0aaf12d76 100644 --- a/code/sdk/zhihui/drivers/cywee/dml/main_dml.c +++ b/code/sdk/zhihui/drivers/cywee/dml/main_dml.c @@ -716,14 +716,14 @@ void cywee_dml_set_activity_mode_setstatus(int cmd) if(cmd == 0) { -#ifdef SUPORT_PPG_SERVICE +#ifdef SUPPORT_PPG_SERVICE send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_DO_PPG_TEST); #endif uapi_save_runtime_log(RUNTIME_LOG_HEART_SPORT_MEASURE); } else { -#ifdef SUPORT_PPG_SERVICE +#ifdef SUPPORT_PPG_SERVICE send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST); #endif uapi_save_runtime_log(RUNTIME_LOG_OXYGEN_SPORT_MEASURE_END); @@ -1016,7 +1016,7 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) { CWM_OS_dbgPrintf("CUSTOM_HEARTRATE !!! \r\n"); if((int)sensorEVT->fData[2] == 1) { -#ifdef SUPORT_PPG_SERVICE +#ifdef SUPPORT_PPG_SERVICE send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_DO_PPG_TEST); #endif uapi_save_runtime_log(RUNTIME_LOG_HEART_SPORT_MEASURE); @@ -1024,7 +1024,7 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) { } else { -#ifdef SUPORT_PPG_SERVICE +#ifdef SUPPORT_PPG_SERVICE send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST); #endif uapi_save_runtime_log(RUNTIME_LOG_OXYGEN_SPORT_MEASURE_END); diff --git a/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.c b/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.c index c9a47371c..29bf3d55f 100644 --- a/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.c +++ b/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.c @@ -402,14 +402,14 @@ void aging_task(void) return; } uapi_get_timestampe_ss(¤t_time); -#ifdef SUPORT_PPG_SERVICE +#ifdef SUPPORT_PPG_SERVICE send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_DO_SINGLE_CHECK_MODE_TEST); #endif LOS_Msleep(200); #ifdef PPG_HX3695 FT_RESULTS_t ft_result = hx3695_factroy_test(SINGLE_CHECK_TEST); #endif -#ifdef SUPORT_PPG_SERVICE +#ifdef SUPPORT_PPG_SERVICE send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST); #endif #ifdef PPG_HX3695 -- 2.17.1