From ee5dc0c5b87afc2ab4975943e477010ac1bc5140 Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Tue, 24 Sep 2024 14:27:02 +0800
Subject: [PATCH] =?utf8?q?#448=20=E8=BF=90=E5=8A=A8=E7=BB=93=E6=9D=9F?=
 =?utf8?q?=E8=AE=AD=E7=BB=83=E8=AE=B0=E5=BD=95=E6=BB=91=E5=8A=A8=E4=BC=9A?=
 =?utf8?q?=E9=81=AE=E6=8C=A1=EF=BC=8C=E5=B9=B6=E4=B8=94=E8=BF=90=E5=8A=A8?=
 =?utf8?q?=E7=BB=93=E6=9D=9F=E4=BC=9A=E6=98=BE=E7=A4=BA=E8=AE=AD=E7=BB=83?=
 =?utf8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../nativeui/traing/src/TraingEnddataView.cpp         |  8 ++++----
 .../traing/training_card/src/TraingCardPresenter.cpp  | 10 +++++++++-
 .../nativeui/traingrecord/src/TraingRecordView.cpp    | 11 +++++++----
 code/sdk/drivers/peripheral/cywee/src/main_dml.c      |  2 +-
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
index 30646da13..a8abf78bb 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
@@ -277,17 +277,17 @@ void TraingEnddataView::ExitView() {
     // 是否为特殊运动
     // 是否包含目标
     InitRollLabel(exitLabel, 80,
-                  (startY_Value + labelInterval * (8 + tagflge) + 120), 300, 40,
+                  (startY_Value + labelInterval * (8 + tagflge) + 100), 300, 40,
                   "label8", STR_MORE_APP, DEFAULT_VECTOR_FONT_FILENAME, 30);
     InitButtonExt(exitButton, 42,
-                  (startY_Value + labelInterval * (8 + tagflge) + 190), 380,
+                  (startY_Value + labelInterval * (8 + tagflge) + 160), 380,
                   100, BUTTONBACK, STR_CLOSE, 30);
   } else {
     InitRollLabel(exitLabel, 80,
-                  (startY_Value + labelInterval * (3 + tagflge) + 120), 300, 40,
+                  (startY_Value + labelInterval * (3 + tagflge) + 100), 300, 40,
                   "label8", STR_MORE_APP, DEFAULT_VECTOR_FONT_FILENAME, 30);
     InitButtonExt(exitButton, 42,
-                  (startY_Value + labelInterval * (3 + tagflge) + 190), 380,
+                  (startY_Value + labelInterval * (3 + tagflge) + 160), 380,
                   100, BUTTONBACK, STR_CLOSE, 30);
   }
   exitLabel->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x7f));
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 86c3e77a8..9d1ea290c 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
@@ -455,7 +455,15 @@ void TraingCardPresenter::handleEndState() {
     NativeAbility::GetInstance().ClearSliceIdStack(); // 清空所有SLiceId栈元素
   } else {
     // 进入训练记录
-    NativeAbility::GetInstance().ChangeSlice(VIEW_TRAINING_RECORD);
+    // NativeAbility::GetInstance().ChangeSlice(VIEW_TRAINING_RECORD);
+    if (TraingModel::GetInstance()->GetEntryType() == APPLIST_ENTER)
+      NativeAbility::GetInstance().ChangeSlice(VIEW_TRAINING,
+                                               TransitionType::TRANSITION_ZOOM);
+    else {
+      NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN,
+                                               TransitionType::TRANSITION_ZOOM);
+      NativeAbility::GetInstance().ClearSliceIdStack(); // 清空所有SLiceId栈元素
+    }
     NativeAbility::GetInstance().ClearSliceIdStack(); // 清空所有SLiceId栈元素
   }
 }
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordView.cpp
index 97bdacdf7..a459d5e4c 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordView.cpp
@@ -29,11 +29,14 @@ namespace OHOS
 
     TraingRecordView::~TraingRecordView()
     {
-        // DeInit();
-        UIViewGroup *tmpGroup = dynamic_cast<UIViewGroup *>(container_);
-        UIViewGroup::RemoveAndDeleteAllRecursively(tmpGroup);
+      // DeInit()
+      lackView->RemoveAll();
+      recordView->RemoveAll();
 
-        g_pTraingRecordView = nullptr;
+      UIViewGroup *tmpGroup = dynamic_cast<UIViewGroup *>(container_);
+      UIViewGroup::RemoveAndDeleteAllRecursively(tmpGroup);
+
+      g_pTraingRecordView = nullptr;
     }
 
     TraingRecordView *TraingRecordView::GetInstance()
diff --git a/code/sdk/drivers/peripheral/cywee/src/main_dml.c b/code/sdk/drivers/peripheral/cywee/src/main_dml.c
index a4ce7f8b5..d94af3468 100644
--- a/code/sdk/drivers/peripheral/cywee/src/main_dml.c
+++ b/code/sdk/drivers/peripheral/cywee/src/main_dml.c
@@ -917,7 +917,7 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) {
                 c_activity_result_extre_info_t.avg_step_len = (float)sensorEVT->fData[2];
                 c_activity_result_extre_info_t.avg_pace = (int)(sensorEVT->fData[3] * 60);
                 c_activity_result_extre_info_t.max_step_freq = (int)sensorEVT->fData[4];
-                c_activity_result_extre_info_t.avg_pace = (int)(sensorEVT->fData[5] * 60);
+                c_activity_result_extre_info_t.max_pace = (int)(sensorEVT->fData[5] * 60);
                 c_activity_result_extre_info_t.activity_zone = (int)sensorEVT->fData[10];
                 c_activity_result_extre_info_t.ativity_zone_moderate_duration = (int)sensorEVT->fData[11];
                 c_activity_result_extre_info_t.ativity_zone_high_duration = (int)sensorEVT->fData[12];
-- 
2.17.1