From 0fe2b70b9a7fc1645bfc677a6273d28334ff3192 Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Wed, 15 Jan 2025 17:30:32 +0800
Subject: [PATCH] =?utf8?q?=E8=BF=90=E5=8A=A8=EF=BC=9A=E8=BF=87=E6=BB=A4?=
 =?utf8?q?=E8=BF=90=E5=8A=A8=E5=B9=B3=E5=9D=87=E9=85=8D=E9=80=9F=E4=B8=BA0?=
 =?utf8?q?=EF=BC=9B=E6=9C=80=E9=AB=98=E6=9C=80=E4=BD=8E=E9=85=8D=E9=80=9F?=
 =?utf8?q?=E4=B8=BA0=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../nativeui/traing/src/TraingModel.cpp       | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

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 0e9817722..30a9efa56 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
@@ -281,7 +281,7 @@ std::string sportIcons[8] = {
 /*特殊运动icon*/
 std::string sportIcons_special[6] = {RUNNING_60_IMAGE_END, WALKING_60_IMAGE_END,
                                      RIDING_60_IMAGE_END,  RUNNING_IMAGE,
-                                     WALKING_IMAGE,    RIDING_IMAGE};
+                                     WALKING_IMAGE,        RIDING_IMAGE};
 
 /*
   type
@@ -495,13 +495,17 @@ void TraingModel::AnalysisData(cywee_activity_result_t *cyweeInfo) {
   // sportdata->cdc = cyweeInfo->step_frequency;
   // sportdata->std = cyweeInfo->step_length;
 
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, " pace %d", sportdata->pc);
+
   sportdata->pc = cyweeInfo->pace;
 
   // 更新最慢配速
-  if (sportdata->spc < sportdata->pc) {
+  if (sportdata->spc < sportdata->pc && sportdata->pc != 0) {
     sportdata->spc = sportdata->pc;
   }
 
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "spc %d", sportdata->spc);
+
   // 计算平均心率
   if (sportdata->heart > 50) {
     sportdata->avgheart = Averageheartrate(sportdata->heart);
@@ -543,10 +547,21 @@ void TraingModel::AnalysisData(cywee_activity_result_t *cyweeInfo) {
 /*分析activity extra info数据*/
 void TraingModel::AnalysisExtraData(
     cywee_activity_result_extre_info_t *cyweeInfo) {
-  sportdata->apc = cyweeInfo->avg_pace;
-  sportdata->fpc = cyweeInfo->max_pace;
-  sportdata->cdc = cyweeInfo->avg_step_freq;
-  sportdata->std = cyweeInfo->avg_step_len * 100; // 前者cm 后者m
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "extra data %d %d %d %d",
+                cyweeInfo->avg_pace, cyweeInfo->max_pace,
+                cyweeInfo->avg_step_freq, cyweeInfo->avg_step_len);
+  if (cyweeInfo->avg_pace != 0) {
+    sportdata->apc = cyweeInfo->avg_pace;
+  }
+  if (cyweeInfo->max_pace != 0) {
+    sportdata->fpc = cyweeInfo->max_pace;
+  }
+  if (cyweeInfo->avg_step_freq != 0) {
+    sportdata->cdc = cyweeInfo->avg_step_freq;
+  }
+  if (cyweeInfo->avg_step_len != 0) {
+    sportdata->std = cyweeInfo->avg_step_len * 100; // 前者cm 后者m
+  }
 }
 /*分析运动心率数据*/
 void TraingModel::AnalysisHeartData(uint8_t hrs) {
-- 
2.17.1