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

Code review from 袁清梦

* refs/changes/1630/head: (3 commits squashed)

  - #1272 运动记录详情页面启动语音助手再退出，运动记录详情页面不能退出

  - 运动：过滤运动平均配速为0；最高最低配速为0的数据

  - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

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>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1630

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp
index f9782fc..a926874 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp
@@ -56,14 +56,14 @@ namespace OHOS
     {
         uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();
 
-        // 根据前一界面切换
-        if (preSlice == VIEW_TRAINING_RECORD)
+        // 根据前一界面切换  如果是训练卡片
+         if (preSlice == VIEW_TRAININGCRAD)
         {
-            NativeAbility::GetInstance().Back();
+            NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGMORE);
         }
-        else if (preSlice == VIEW_TRAININGCRAD)
+        else
         {
-            NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGMORE);
+            NativeAbility::GetInstance().Back();
         }
     }
 

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 0e98177..30a9efa 100644 (file)
--- 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) {