From baf7aca6c71207d21fa025cb2f54e2df98b604fc Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Thu, 18 Apr 2024 15:09:12 +0800
Subject: [PATCH] =?utf8?q?=E8=AE=BE=E7=BD=AE=E7=9B=AE=E6=A0=87=E7=95=8C?=
 =?utf8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=AD=A5=E6=95=B0=E4=BB=A5=E5=8F=8A?=
 =?utf8?q?=E8=B7=9D=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../nativeui/traing/include/TraingSetView.h   |  18 ++-
 .../nativeui/traing/src/TraingSetView.cpp     | 103 +++++++++++++++---
 2 files changed, 102 insertions(+), 19 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetView.h
index 012ea3982..ea52a7cb1 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetView.h
@@ -29,6 +29,8 @@ namespace OHOS
 {
 #define BUTTONTIME "button1"
 #define BUTTONCALULI "button2"
+#define BUTTONDISTANCE "button3"
+#define BUTTONSTEPS "button4"
 
     class TraingSetPresenter;
     class TrainingSetCaluliView;
@@ -68,14 +70,26 @@ namespace OHOS
         TrainingSetTimeView *settime{nullptr};
 
         UILabelExt *labeltitle = nullptr;
-        UILabelExt *labeltime = nullptr;
+
+        UILabelExt *labelTime = nullptr;
         UILabelExt *labelKcal = nullptr;
+        UILabelExt *labelDistance = nullptr;
+        UILabelExt *labelSteps = nullptr;
+
         UIImageView *imagetime = nullptr;
         UIImageView *imagcal = nullptr;
+        UIImageView *imagedistance = nullptr;
+        UIImageView *imagesteps = nullptr;
+
         UIImageView *imagicon1 = nullptr;
-        UIImageView *imagico2 = nullptr;
+        UIImageView *imagicon2 = nullptr;
+        UIImageView *imagicon3 = nullptr;
+        UIImageView *imagicon4 = nullptr;
+
         UIButton *butTime = nullptr;
         UIButton *butKcal = nullptr;
+        UIButton *butDistance = nullptr;
+        UIButton *butSteps = nullptr;
 
         bool viewiInitStatus{false};
     };
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp
index 772d94a56..282b7fecd 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp
@@ -42,35 +42,55 @@ namespace OHOS
             SetTagScrollView[SET_VIEW]->SetPosition(0, 0, 466, 466);
             SetTagScrollView[SET_VIEW]->SetStyle(STYLE_BACKGROUND_OPA, 0);
         }
-
         //  初始化Button
         TraingModel::GetInstance()->InitButton(butTime, 43, 120, 380, 100, BUTTONTIME);
         TraingModel::GetInstance()->InitButton(butKcal, 43, 240, 380, 100, BUTTONCALULI);
         butTime->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingSetPresenter::GetInstance()));
         butKcal->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingSetPresenter::GetInstance()));
+
+        TraingModel::GetInstance()->InitButton(butDistance, 43, 360, 380, 100, BUTTONDISTANCE);
+        TraingModel::GetInstance()->InitButton(butSteps, 43, 480, 380, 100, BUTTONSTEPS);
+        butDistance->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingSetPresenter::GetInstance()));
+        butSteps->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingSetPresenter::GetInstance()));
+
         SetTagScrollView[SET_VIEW]->Add(butTime);
         SetTagScrollView[SET_VIEW]->Add(butKcal);
-
+        SetTagScrollView[SET_VIEW]->Add(butDistance);
+        SetTagScrollView[SET_VIEW]->Add(butSteps);
         // 初始化Lable
         UIResourceTextId sportid = TraingModel::GetInstance()->GetSportEvent();
         TraingModel::GetInstance()->InitLabelExt(labeltitle, 83, 50, 300, 35, "label1", sportid, DEFAULT_VECTOR_FONT_FILENAME, 30);
-
-        TraingModel::GetInstance()->InitLabel(labeltime, 100, 150, 150, 35, "label2", "时长", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        TraingModel::GetInstance()->InitLabel(labelTime, 100, 150, 150, 35, "label2", "时长", DEFAULT_VECTOR_FONT_FILENAME, 30);
         TraingModel::GetInstance()->InitLabel(labelKcal, 100, 270, 150, 35, "label4", "卡路里", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        TraingModel::GetInstance()->InitLabel(labelDistance, 100, 390, 150, 35, "label3", "距离", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        TraingModel::GetInstance()->InitLabel(labelSteps, 100, 510, 150, 35, "label5", "步数", DEFAULT_VECTOR_FONT_FILENAME, 30);
 
         SetTagScrollView[SET_VIEW]->Add(labeltitle);
-        SetTagScrollView[SET_VIEW]->Add(labeltime);
+        SetTagScrollView[SET_VIEW]->Add(labelTime);
         SetTagScrollView[SET_VIEW]->Add(labelKcal);
+        SetTagScrollView[SET_VIEW]->Add(labelDistance);
+        SetTagScrollView[SET_VIEW]->Add(labelSteps);
 
         // 初始化Image
         TraingModel::GetInstance()->InitImageView(imagetime, 70, 150, 100, 100, "image1", TIME_IMAGE);
         TraingModel::GetInstance()->InitImageView(imagcal, 70, 270, 100, 100, "image2", CALORIES_IMAGE);
+        TraingModel::GetInstance()->InitImageView(imagedistance, 70, 390, 100, 100, "image5", MILEAGE_IMAGE);
+        TraingModel::GetInstance()->InitImageView(imagesteps, 70, 510, 100, 100, "image6", WALKING_IMAGE);
+
         TraingModel::GetInstance()->InitImageView(imagicon1, 380, 160, 100, 100, "image3", ICON_IMAGE);
-        TraingModel::GetInstance()->InitImageView(imagico2, 380, 280, 100, 100, "image4", ICON_IMAGE);
+        TraingModel::GetInstance()->InitImageView(imagicon2, 380, 280, 100, 100, "image4", ICON_IMAGE);
+        TraingModel::GetInstance()->InitImageView(imagicon3, 380, 400, 100, 100, "image3", ICON_IMAGE);
+        TraingModel::GetInstance()->InitImageView(imagicon4, 380, 520, 100, 100, "image4", ICON_IMAGE);
+
         SetTagScrollView[SET_VIEW]->Add(imagetime);
         SetTagScrollView[SET_VIEW]->Add(imagcal);
+        SetTagScrollView[SET_VIEW]->Add(imagedistance);
+        SetTagScrollView[SET_VIEW]->Add(imagesteps);
+
         SetTagScrollView[SET_VIEW]->Add(imagicon1);
-        SetTagScrollView[SET_VIEW]->Add(imagico2);
+        SetTagScrollView[SET_VIEW]->Add(imagicon2);
+        SetTagScrollView[SET_VIEW]->Add(imagicon3);
+        SetTagScrollView[SET_VIEW]->Add(imagicon4);
     }
     /* DeInit：删除组件 */
     void TraingSetView::DeInit()
@@ -83,11 +103,11 @@ namespace OHOS
             delete labeltitle;
             labeltitle = nullptr;
         }
-        if (labeltime != nullptr)
+        if (labelTime != nullptr)
         {
-            SetTagScrollView[SET_VIEW]->Remove(labeltime);
-            delete labeltime;
-            labeltime = nullptr;
+            SetTagScrollView[SET_VIEW]->Remove(labelTime);
+            delete labelTime;
+            labelTime = nullptr;
         }
         if (labelKcal != nullptr)
         {
@@ -95,6 +115,18 @@ namespace OHOS
             delete labelKcal;
             labelKcal = nullptr;
         }
+        if (labelSteps != nullptr)
+        {
+            SetTagScrollView[SET_VIEW]->Remove(labelSteps);
+            delete labelSteps;
+            labelSteps = nullptr;
+        }
+        if (labelDistance != nullptr)
+        {
+            SetTagScrollView[SET_VIEW]->Remove(labelDistance);
+            delete labelDistance;
+            labelDistance = nullptr;
+        }
         // 删除Button
         if (butTime != nullptr)
         {
@@ -108,6 +140,18 @@ namespace OHOS
             delete butKcal;
             butKcal = nullptr;
         }
+        if (butDistance != nullptr)
+        {
+            SetTagScrollView[SET_VIEW]->Remove(butDistance);
+            delete butDistance;
+            butDistance = nullptr;
+        }
+        if (butSteps != nullptr)
+        {
+            SetTagScrollView[SET_VIEW]->Remove(butSteps);
+            delete butSteps;
+            butSteps = nullptr;
+        }
         // 删除Image
         if (imagetime != nullptr)
         {
@@ -121,17 +165,42 @@ namespace OHOS
             delete imagcal;
             imagcal = nullptr;
         }
+        if (imagedistance != nullptr)
+        {
+            SetTagScrollView[SET_VIEW]->Remove(imagedistance);
+            delete imagedistance;
+            imagedistance = nullptr;
+        }
+        if (imagesteps != nullptr)
+        {
+            SetTagScrollView[SET_VIEW]->Remove(imagesteps);
+            delete imagesteps;
+            imagesteps = nullptr;
+        }
+
         if (imagicon1 != nullptr)
         {
             SetTagScrollView[SET_VIEW]->Remove(imagicon1);
             delete imagicon1;
             imagicon1 = nullptr;
         }
-        if (imagico2 != nullptr)
+        if (imagicon2 != nullptr)
+        {
+            SetTagScrollView[SET_VIEW]->Remove(imagicon2);
+            delete imagicon2;
+            imagicon2 = nullptr;
+        }
+        if (imagicon3 != nullptr)
+        {
+            SetTagScrollView[SET_VIEW]->Remove(imagicon3);
+            delete imagicon3;
+            imagicon3 = nullptr;
+        }
+        if (imagicon4 != nullptr)
         {
-            SetTagScrollView[SET_VIEW]->Remove(imagico2);
-            delete imagico2;
-            imagico2 = nullptr;
+            SetTagScrollView[SET_VIEW]->Remove(imagicon4);
+            delete imagicon4;
+            imagicon4 = nullptr;
         }
 
         // 删除容器
@@ -254,8 +323,8 @@ namespace OHOS
         }
         SetTagScrollView[SET_VIEW]->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
         SetTagScrollView[SET_VIEW]->SetStyle(STYLE_BACKGROUND_OPA, 0xff);
-        SetTagScrollView[SET_VIEW]->SetScrollBlankSize(35);
-        SetTagScrollView[SET_VIEW]->SetReboundSize(50);
+        SetTagScrollView[SET_VIEW]->SetScrollBlankSize(50);
+        SetTagScrollView[SET_VIEW]->SetReboundSize(100);
         SetTagScrollView[SET_VIEW]->SetDirection(1);
 
         // 创建 draglistener 实例并设置为拖动监听器
-- 
2.17.1