设置目标界面增加步数以及距离

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 012ea39..ea52a7c 100644 (file)
--- 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 772d94a..282b7fe 100644 (file)
--- 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);\r
             SetTagScrollView[SET_VIEW]->SetStyle(STYLE_BACKGROUND_OPA, 0);\r
         }\r
-\r
         //  初始化Button\r
         TraingModel::GetInstance()->InitButton(butTime, 43, 120, 380, 100, BUTTONTIME);\r
         TraingModel::GetInstance()->InitButton(butKcal, 43, 240, 380, 100, BUTTONCALULI);\r
         butTime->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingSetPresenter::GetInstance()));\r
         butKcal->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingSetPresenter::GetInstance()));\r
+\r
+        TraingModel::GetInstance()->InitButton(butDistance, 43, 360, 380, 100, BUTTONDISTANCE);\r
+        TraingModel::GetInstance()->InitButton(butSteps, 43, 480, 380, 100, BUTTONSTEPS);\r
+        butDistance->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingSetPresenter::GetInstance()));\r
+        butSteps->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingSetPresenter::GetInstance()));\r
+\r
         SetTagScrollView[SET_VIEW]->Add(butTime);\r
         SetTagScrollView[SET_VIEW]->Add(butKcal);\r
-\r
+        SetTagScrollView[SET_VIEW]->Add(butDistance);\r
+        SetTagScrollView[SET_VIEW]->Add(butSteps);\r
         // 初始化Lable\r
         UIResourceTextId sportid = TraingModel::GetInstance()->GetSportEvent();\r
         TraingModel::GetInstance()->InitLabelExt(labeltitle, 83, 50, 300, 35, "label1", sportid, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
-\r
-        TraingModel::GetInstance()->InitLabel(labeltime, 100, 150, 150, 35, "label2", "时长", DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        TraingModel::GetInstance()->InitLabel(labelTime, 100, 150, 150, 35, "label2", "时长", DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         TraingModel::GetInstance()->InitLabel(labelKcal, 100, 270, 150, 35, "label4", "卡路里", DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        TraingModel::GetInstance()->InitLabel(labelDistance, 100, 390, 150, 35, "label3", "距离", DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        TraingModel::GetInstance()->InitLabel(labelSteps, 100, 510, 150, 35, "label5", "步数", DEFAULT_VECTOR_FONT_FILENAME, 30);\r
 \r
         SetTagScrollView[SET_VIEW]->Add(labeltitle);\r
-        SetTagScrollView[SET_VIEW]->Add(labeltime);\r
+        SetTagScrollView[SET_VIEW]->Add(labelTime);\r
         SetTagScrollView[SET_VIEW]->Add(labelKcal);\r
+        SetTagScrollView[SET_VIEW]->Add(labelDistance);\r
+        SetTagScrollView[SET_VIEW]->Add(labelSteps);\r
 \r
         // 初始化Image\r
         TraingModel::GetInstance()->InitImageView(imagetime, 70, 150, 100, 100, "image1", TIME_IMAGE);\r
         TraingModel::GetInstance()->InitImageView(imagcal, 70, 270, 100, 100, "image2", CALORIES_IMAGE);\r
+        TraingModel::GetInstance()->InitImageView(imagedistance, 70, 390, 100, 100, "image5", MILEAGE_IMAGE);\r
+        TraingModel::GetInstance()->InitImageView(imagesteps, 70, 510, 100, 100, "image6", WALKING_IMAGE);\r
+\r
         TraingModel::GetInstance()->InitImageView(imagicon1, 380, 160, 100, 100, "image3", ICON_IMAGE);\r
-        TraingModel::GetInstance()->InitImageView(imagico2, 380, 280, 100, 100, "image4", ICON_IMAGE);\r
+        TraingModel::GetInstance()->InitImageView(imagicon2, 380, 280, 100, 100, "image4", ICON_IMAGE);\r
+        TraingModel::GetInstance()->InitImageView(imagicon3, 380, 400, 100, 100, "image3", ICON_IMAGE);\r
+        TraingModel::GetInstance()->InitImageView(imagicon4, 380, 520, 100, 100, "image4", ICON_IMAGE);\r
+\r
         SetTagScrollView[SET_VIEW]->Add(imagetime);\r
         SetTagScrollView[SET_VIEW]->Add(imagcal);\r
+        SetTagScrollView[SET_VIEW]->Add(imagedistance);\r
+        SetTagScrollView[SET_VIEW]->Add(imagesteps);\r
+\r
         SetTagScrollView[SET_VIEW]->Add(imagicon1);\r
-        SetTagScrollView[SET_VIEW]->Add(imagico2);\r
+        SetTagScrollView[SET_VIEW]->Add(imagicon2);\r
+        SetTagScrollView[SET_VIEW]->Add(imagicon3);\r
+        SetTagScrollView[SET_VIEW]->Add(imagicon4);\r
     }\r
     /* DeInit：删除组件 */\r
     void TraingSetView::DeInit()\r
@@ -83,11 +103,11 @@ namespace OHOS
             delete labeltitle;\r
             labeltitle = nullptr;\r
         }\r
-        if (labeltime != nullptr)\r
+        if (labelTime != nullptr)\r
         {\r
-            SetTagScrollView[SET_VIEW]->Remove(labeltime);\r
-            delete labeltime;\r
-            labeltime = nullptr;\r
+            SetTagScrollView[SET_VIEW]->Remove(labelTime);\r
+            delete labelTime;\r
+            labelTime = nullptr;\r
         }\r
         if (labelKcal != nullptr)\r
         {\r
@@ -95,6 +115,18 @@ namespace OHOS
             delete labelKcal;\r
             labelKcal = nullptr;\r
         }\r
+        if (labelSteps != nullptr)\r
+        {\r
+            SetTagScrollView[SET_VIEW]->Remove(labelSteps);\r
+            delete labelSteps;\r
+            labelSteps = nullptr;\r
+        }\r
+        if (labelDistance != nullptr)\r
+        {\r
+            SetTagScrollView[SET_VIEW]->Remove(labelDistance);\r
+            delete labelDistance;\r
+            labelDistance = nullptr;\r
+        }\r
         // 删除Button\r
         if (butTime != nullptr)\r
         {\r
@@ -108,6 +140,18 @@ namespace OHOS
             delete butKcal;\r
             butKcal = nullptr;\r
         }\r
+        if (butDistance != nullptr)\r
+        {\r
+            SetTagScrollView[SET_VIEW]->Remove(butDistance);\r
+            delete butDistance;\r
+            butDistance = nullptr;\r
+        }\r
+        if (butSteps != nullptr)\r
+        {\r
+            SetTagScrollView[SET_VIEW]->Remove(butSteps);\r
+            delete butSteps;\r
+            butSteps = nullptr;\r
+        }\r
         // 删除Image\r
         if (imagetime != nullptr)\r
         {\r
@@ -121,17 +165,42 @@ namespace OHOS
             delete imagcal;\r
             imagcal = nullptr;\r
         }\r
+        if (imagedistance != nullptr)\r
+        {\r
+            SetTagScrollView[SET_VIEW]->Remove(imagedistance);\r
+            delete imagedistance;\r
+            imagedistance = nullptr;\r
+        }\r
+        if (imagesteps != nullptr)\r
+        {\r
+            SetTagScrollView[SET_VIEW]->Remove(imagesteps);\r
+            delete imagesteps;\r
+            imagesteps = nullptr;\r
+        }\r
+\r
         if (imagicon1 != nullptr)\r
         {\r
             SetTagScrollView[SET_VIEW]->Remove(imagicon1);\r
             delete imagicon1;\r
             imagicon1 = nullptr;\r
         }\r
-        if (imagico2 != nullptr)\r
+        if (imagicon2 != nullptr)\r
+        {\r
+            SetTagScrollView[SET_VIEW]->Remove(imagicon2);\r
+            delete imagicon2;\r
+            imagicon2 = nullptr;\r
+        }\r
+        if (imagicon3 != nullptr)\r
+        {\r
+            SetTagScrollView[SET_VIEW]->Remove(imagicon3);\r
+            delete imagicon3;\r
+            imagicon3 = nullptr;\r
+        }\r
+        if (imagicon4 != nullptr)\r
         {\r
-            SetTagScrollView[SET_VIEW]->Remove(imagico2);\r
-            delete imagico2;\r
-            imagico2 = nullptr;\r
+            SetTagScrollView[SET_VIEW]->Remove(imagicon4);\r
+            delete imagicon4;\r
+            imagicon4 = nullptr;\r
         }\r
 \r
         // 删除容器\r
@@ -254,8 +323,8 @@ namespace OHOS
         }\r
         SetTagScrollView[SET_VIEW]->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());\r
         SetTagScrollView[SET_VIEW]->SetStyle(STYLE_BACKGROUND_OPA, 0xff);\r
-        SetTagScrollView[SET_VIEW]->SetScrollBlankSize(35);\r
-        SetTagScrollView[SET_VIEW]->SetReboundSize(50);\r
+        SetTagScrollView[SET_VIEW]->SetScrollBlankSize(50);\r
+        SetTagScrollView[SET_VIEW]->SetReboundSize(100);\r
         SetTagScrollView[SET_VIEW]->SetDirection(1);\r
 \r
         // 创建 draglistener 实例并设置为拖动监听器\r