From e81a9937f85d998f29ccf8e1e0b2b91151deb7c8 Mon Sep 17 00:00:00 2001 From: Caisking Date: Tue, 29 Jul 2025 14:40:29 +0800 Subject: [PATCH] =?utf8?q?=E5=B1=8F=E8=94=BD=E9=83=A8=E5=88=86=E6=89=93?= =?utf8?q?=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../fd230/nativeapp/nativeui/heartrate/src/HeartModel.cpp | 4 ++-- .../fd230/nativeapp/nativeui/traing/src/TraingModel.cpp | 8 ++++---- code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) 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 fbc80a6fc..110b97205 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 @@ -1042,7 +1042,7 @@ static void heart_data_callbackProc(int data) { uint8_t wear = 1; #ifdef SUPPORT_PPG_SERVICE wear = ppg_get_wear_status(); - printf("heart_data_callbackProc::wear = %d\n", wear); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"heart_data_callbackProc::hrs = %d\n", hrs); wear = 1; //暂时屏蔽 #endif if (wear == 0) { @@ -1052,7 +1052,7 @@ static void heart_data_callbackProc(int data) { uint8_t hrs = 0; #ifdef SUPPORT_PPG_SERVICE hrs = ppg_get_hrs(); - printf("heart_data_callbackProc::hrs = %d\n", hrs); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"heart_data_callbackProc::hrs = %d\n", hrs); #endif OHOS::HeartModel::GetInstance()->UpHeartdata(hrs); } diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingModel.cpp index 742bed253..48eaa0abc 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingModel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingModel.cpp @@ -233,7 +233,7 @@ TraingModel ::TraingModel() { TraingModel ::~TraingModel() { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingModel::~TraingModel()"); // TraingUnsubscribeTopic(TOPIC_EVENT_ACTIVITY_UPDATE); // 取消订阅 - // TraingUnsubscribeTopic(TOPIC_EVENT_BLE_TRAINING); + TraingUnsubscribeTopic(TOPIC_EVENT_BLE_TRAINING); // TraingUnsubscribeTopic(TOPIC_EVENT_HEARTRATE_UPDATA); // TraingUnsubscribeTopic(TOPIC_EVENT_ACTIVITY_EXTRA_INFO_UPDATE); } @@ -244,7 +244,7 @@ TraingModel *TraingModel::GetInstance(void) { void TraingModel ::Init() { // TraingSubscribeTopic(TOPIC_EVENT_ACTIVITY_UPDATE); // 进行消息订阅 - // TraingSubscribeTopic(TOPIC_EVENT_BLE_TRAINING); + TraingSubscribeTopic(TOPIC_EVENT_BLE_TRAINING); // TraingSubscribeTopic(TOPIC_EVENT_HEARTRATE_UPDATA); // TraingSubscribeTopic(TOPIC_EVENT_ACTIVITY_EXTRA_INFO_UPDATE); } @@ -2394,7 +2394,7 @@ static void sport_data_callbackProc(int data) { uint8_t hrs = 0; #ifdef SUPPORT_PPG_SERVICE hrs = ppg_get_hrs(); - printf("heart_data_callbackProc::hrs = %d\n", hrs); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"heart_data_callbackProc::hrs = %d\n", hrs); #endif TraingModel::GetInstance()->AnalysisHeartData(hrs); } @@ -2550,4 +2550,4 @@ void ble_training_init(void) { #endif -} // namespace OHOS +} // namespace OHOS \ No newline at end of file diff --git a/code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c b/code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c index ef7619f77..94b0de845 100644 --- a/code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c +++ b/code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c @@ -3058,8 +3058,7 @@ void hx3695_hrs_ppg_Int_handle(void) // PRINT("hrsresult.wearstatus: %d, hr_living: %d, hr_result:%d \r\n",hrsresult.wearstatus,hrsresult.hr_living,hrsresult.lastesthrs); - PRINT("hx3695 data_cnt: %d, hr_living: %d, hr_living_qu: %d, hr_living_std: %d, hr_result:%d \r\n", - alg_results.data_cnt, hrsresult.hr_living, hrsresult.hr_living_qu, hrsresult.hr_living_std, hrsresult.lastesthrs); + // PRINT("hx3695 data_cnt: %d, hr_living: %d, hr_living_qu: %d, hr_living_std: %d, hr_result:%d \r\n",alg_results.data_cnt, hrsresult.hr_living, hrsresult.hr_living_qu, hrsresult.hr_living_std, hrsresult.lastesthrs); if(hrs_wear_status == MSG_HRS_WEAR && hrsresult.hr_living == MSG_LIVING_TRUE) { -- 2.17.1