From: Caisking <3449750381@qq.com> Date: Wed, 10 Apr 2024 12:30:59 +0000 (+0800) Subject: 修复数据传输,增加数据日志打印 X-Git-Tag: release_V1.2.70_20241020_135402~1200^2~3^2~1 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=1471f582ea7eb89c0b5c8770007078e584aa3c6b;p=mirrors%2FFD230.git 修复数据传输,增加数据日志打印 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp index 2e6b9ec69..4f9d0eb3b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp @@ -331,14 +331,49 @@ namespace OHOS { return; } + cywee_result_t *cyweeInfo = nullptr; // 在switch语句外部定义变量 + int rets; switch (request->msgId) { case TOPIC_EVENT_TREADMILL_UPDATE: + cyweeInfo = new cywee_result_t(); // 在case块内分配内存 + rets = memcpy_s(cyweeInfo, sizeof(cywee_result_t), (cywee_result_t *)request->data, request->len); + if (rets != EOK) + { + delete cyweeInfo; // 处理内存分配失败的情况 + cyweeInfo = NULL; + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "memcpy_s cywee_result_t fail! ret = %d", rets); + return; + } + TraingModel::GetInstance()->AnalysisData(cyweeInfo); + break; case TOPIC_EVENT_OUTDOOR_RUNNING_UPDATE: + cyweeInfo = new cywee_result_t(); // 在case块内分配内存 + rets = memcpy_s(cyweeInfo, sizeof(cywee_result_t), (cywee_result_t *)request->data, request->len); + if (rets != EOK) + { + delete cyweeInfo; // 处理内存分配失败的情况 + cyweeInfo = NULL; + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "memcpy_s cywee_result_t fail! ret = %d", rets); + return; + } + TraingModel::GetInstance()->AnalysisData(cyweeInfo); + break; case TOPIC_EVENT_INDOOR_RUNNING_UPDATE: + cyweeInfo = new cywee_result_t(); // 在case块内分配内存 + rets = memcpy_s(cyweeInfo, sizeof(cywee_result_t), (cywee_result_t *)request->data, request->len); + if (rets != EOK) + { + delete cyweeInfo; // 处理内存分配失败的情况 + cyweeInfo = NULL; + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "memcpy_s cywee_result_t fail! ret = %d", rets); + return; + } + TraingModel::GetInstance()->AnalysisData(cyweeInfo); + break; case TOPIC_EVENT_FITNESS_PEDOMETERR_UPDATE: - cywee_result_t *cyweeInfo = new cywee_result_t(); // 在case块内分配内存 - int rets = memcpy_s(cyweeInfo, sizeof(cywee_result_t), (cywee_result_t *)request->data, request->len); + cyweeInfo = new cywee_result_t(); // 在case块内分配内存 + rets = memcpy_s(cyweeInfo, sizeof(cywee_result_t), (cywee_result_t *)request->data, request->len); if (rets != EOK) { delete cyweeInfo; // 处理内存分配失败的情况 @@ -347,12 +382,12 @@ namespace OHOS return; } TraingModel::GetInstance()->AnalysisData(cyweeInfo); - delete cyweeInfo; // 释放内存 break; default: // 处理未知msgId的情况 break; } + delete cyweeInfo; // 释放内存 } /* -------------------------------------------------------------------------- */ #if TIMER diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardPresenter.h index 3b646f974..2ae9821d1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardPresenter.h @@ -14,6 +14,7 @@ #include "TraingCardView.h" #include "traing/training_card/include/TrainingControlView.h" #include "traing/training_card/include/TrainingDataView.h" +#include "traing/training_card/include/TrainingDetailView.h" #include "ModelListenerSample.h" #include "cywee_service.h" @@ -25,6 +26,8 @@ namespace OHOS class TraingCardView; class TrainingControlView; class TrainingDataView; + class TrainingDetailView; + class TraingModel; class TraingCardPresenter : public Presenter, public UIView::OnClickListener, public UIView::OnDragListener, diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp index eb3918a3e..5d12e9852 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp @@ -131,6 +131,7 @@ namespace OHOS default: break; } + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OpenSensor--%d!!", type); return true; } @@ -151,6 +152,7 @@ namespace OHOS default: break; } + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ControlSensor--%d!!", state); return true; } void TraingCardPresenter::RefreshData() @@ -172,11 +174,14 @@ namespace OHOS TrainingDetailView::GetInstance()->GetCalorieLabel()->SetText(calorieStr.c_str()); TrainingDetailView::GetInstance()->GetMileLabel()->SetText(distanceStr.c_str()); TrainingDetailView::GetInstance()->GetStepLabel()->SetText(stepsStr.c_str()); + + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ControlSensor--%s %s %s!!", calorieStr.c_str(), distanceStr.c_str(), stepsStr.c_str()); } void TraingCardPresenter::Notify(void) { TrainingDataView::GetInstance()->UpdataTime(); + RefreshData(); } /* -------------------------------------------------------------------------- */ @@ -195,7 +200,7 @@ namespace OHOS // 暂停计时器 PauseTimer(); // 暂停运动库 - OpenSensor(ExerciseState::Pause); + ControlSensor(ExerciseState::Pause); return true; } // 暂停状态