From: 袁清梦 <3449750381@qq.com>
Date: Thu, 14 Nov 2024 10:58:33 +0000 (+0000)
Subject: Merge #1399 into sdk602patch0911 from refs/changes/1399/head
X-Git-Tag: fd230_release_V1.3.102~78^2~2
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=8b7e4f76eccadacf95edaa11a48e6e2baf2614bf;p=mirrors%2FFD230.git

Merge #1399 into sdk602patch0911 from refs/changes/1399/head

训练：优化最后的训练强度数据

* refs/changes/1399/head: (1 commits squashed)

  - 训练：优化最后的训练强度数据

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>

CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1399
---

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 4351648bf..109bb4c0f 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
@@ -492,7 +492,7 @@ void TraingModel::AnalysisExtraData(
   sportdata->std = cyweeInfo->avg_step_len * 100; // 前者cm 后者m
 }
 /*分析运动心率数据*/
-void TraingModel::AnalysisHeartData(u_int8_t hrs) {
+void TraingModel::AnalysisHeartData(uint8_t hrs) {
   sportdata->heart = hrs;
   SetIntensity(sportdata->heart); // 设置训练强度
 }
@@ -640,6 +640,10 @@ void TraingModel::SetTimestamp() {
 
     // 记录运动数据
     // RecordSportData();
+  
+    //配置最后的训练强度(平均心率为标准)
+    SetIntensity(sportdata->avgheart);
+
     do_custom_fileoperate_service_check_msg(
         CUSTOM_FILEOPERATE_MSG_TYPE_SPORTDATA_SAVE, nullptr, 0);