From: Caisking <3449750381@qq.com> Date: Tue, 29 Oct 2024 09:26:03 +0000 (+0800) Subject: 训练:优化安卓运动过程中修改心率的同步更新 X-Git-Tag: fd230_release_V1.3.102~165^2~2 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=095134e94cb12c230b98086ae9e78e449e51d60e;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 33aeae59f..9254f4c86 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp @@ -456,6 +456,11 @@ void TraingModel::AnalysisData(cywee_activity_result_t *cyweeInfo) { GraphicService::GetInstance()->PostGraphicEvent( std::bind(&TraingCardView::SetPopupViewStatus, TraingCardView::GetInstance(), HeartPopup, true)); + if (TraingCardView::GetInstance()->GetHeartMaxLabel()) { + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&TraingCardView::SetHeartMaxLabel, + TraingCardView::GetInstance(), user_maxHeart)); + } } } } @@ -587,11 +592,13 @@ void TraingModel::SetTimestamp() { printf("SetTimestamp::time:%u \r\n", time); sportdata->starttime = time; - + sportdata->sportType = sportType_; // 训练类型 sportdata->sportId = sportId_; IsSpecialSport(sportdata->sportId); // 配置运动特殊性状态 + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "训练目标:类型: %d 值: %d", + sportTagType_, sportTag_); if (sportTag_) // 有值才设置[训练目标] { sportdata->sportTagType = sportTagType_; @@ -921,8 +928,10 @@ UIResourceTextId TraingModel::GetIntensity() { /* 获取当前的目标值 */ int TraingModel::GetSportTagData() { - if (sportdata->tag == 0) + if (sportdata->tag == 0) { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "sportdata->tag is 0"); return 0; + } float goaldegree = 0.0f; // 初始化目标完成度 @@ -958,12 +967,20 @@ int TraingModel::GetSportTagData() { break; } + WEARABLE_LOGD( + WEARABLE_LOG_MODULE_APP, + " [goaldegree %d, sportdata->tag %d, sportdata->duration %d, " + "sportdata->calories %d,sportdata->distance %d, sportdata->steps %d]", + goaldegree, sportdata->tag, sportdata->duration, sportdata->calories, + sportdata->distance, sportdata->steps); + return static_cast(round(goaldegree)); // 返回目标完成度 } /* 获取训练目标完成百分比 */ int TraingModel::GetGoaldegree() { if (sportdata->tag == 0) { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "sportdata->tag is 0"); return 0; // 如果目标值为 0,返回 0% } @@ -975,7 +992,7 @@ int TraingModel::GetGoaldegree() { /* 训练目标校验 */ void TraingModel::CheckSportTag() { // 运动开始才计算 - if (sportdata->tag && sportState_ != ExerciseState::General) { + if (sportdata->tag) { sportdata->goaldegree = GetGoaldegree(); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "sportdata->goaldegree %d", sportdata->goaldegree); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h index 38126469a..8c8d773e7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h @@ -98,6 +98,8 @@ namespace OHOS int GetCurrentPage(); void SetPopupViewStatus(PopupType type, bool status); UIImageAnimatorView *GetAnimator(); + UILabelExt *GetHeartMaxLabel(); + void SetHeartMaxLabel(int maxheart); private: UIView::OnDragListener *draglistener{nullptr}; diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c index f7ed381ee..e921377a0 100644 --- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c +++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c @@ -4566,7 +4566,7 @@ static void SetMaxHrRemindCmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *t else if(maxHr <= 0) maxHr = 0; set_traning_heart_max(maxHr); //设置255 表示心率提醒关闭 - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"设置最高心率提醒 %d\r\n",maxHr); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"设置最高心率提醒 %d\r\n",maxHr); value[17] = 1; value[18] = Calculate_CRC(value,18); sendBleData(value,19);