#448 运动结束训练记录滑动会遮挡，并且运动结束会显示训练历史记录

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 30646da..a8abf78 100644 (file)
--- 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 86c3e77..9d1ea29 100644 (file)
--- 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栈元素\r
   } else {\r
     // 进入训练记录\r
-    NativeAbility::GetInstance().ChangeSlice(VIEW_TRAINING_RECORD);\r
+    // NativeAbility::GetInstance().ChangeSlice(VIEW_TRAINING_RECORD);\r
+    if (TraingModel::GetInstance()->GetEntryType() == APPLIST_ENTER)\r
+      NativeAbility::GetInstance().ChangeSlice(VIEW_TRAINING,\r
+                                               TransitionType::TRANSITION_ZOOM);\r
+    else {\r
+      NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN,\r
+                                               TransitionType::TRANSITION_ZOOM);\r
+      NativeAbility::GetInstance().ClearSliceIdStack(); // 清空所有SLiceId栈元素\r
+    }\r
     NativeAbility::GetInstance().ClearSliceIdStack(); // 清空所有SLiceId栈元素\r
   }\r
 }\r

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 97bdacd..a459d5e 100644 (file)
--- 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 a4ce7f8..d94af34 100644 (file)
--- 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];