修改训练UI初始化接口 77/3
authorCaisking <3449750381@qq.com>
Thu, 25 Apr 2024 02:56:45 +0000 (10:56 +0800)
committerCaisking <3449750381@qq.com>
Thu, 25 Apr 2024 02:56:45 +0000 (10:56 +0800)
71 files changed:
code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEnddataView.h
code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalView.h
code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetView.h
code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingView.h
code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetCaluliView.h
code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetMileView.h
code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetStepView.h
code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetTimeView.h
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetCaluliView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetMileView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetStepView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetTimeView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSView.h
code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSbackView.h
code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSlackView.h
code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSlostView.h
code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSnoteView.h
code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSsetView.h
code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlackView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlostView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSnoteView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSsetView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardPresenter.h
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TrainingDataView.h
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TrainingDetailView.h
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDetailView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticItemView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallItemView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceItemView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessItemView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceItemView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreItemView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherItemView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestItemView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestView.cpp
code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordView.h

index 9051d07..b141b59 100644 (file)
@@ -1,3 +1,9 @@
+/***
+ * @Date: 2024-04-15 10:55:58
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-04-25 10:32:38
+ * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEnddataView.h
+ */
 /***
  * @Date: 2024-04-15 10:55:58
  * @LastEditors: Caisking 3449750381@qq.com
 #include "wearable_log.h"
 #include "ohos_types.h"
 #include "components/ui_card_page.h"
-#include "traing/include/TraingModel.h"
-#include "traing/Training_UiConfig.h"
 
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 #include "TraingEnddataPresenter.h"
 namespace OHOS
index 1daf04c..4eefcfb 100644 (file)
 #include "BaseView.h"
 #include "View.h"
 #include "string.h"
-#include "components/ui_scroll_view.h"
-#include "components/ui_view_group.h"
-#include "components/ui_label.h"
-#include "components/ui_label_ext.h"
-#include "components/ui_image_view.h"
-#include "components/ui_button.h"
-#include "components/ui_image_animator.h"
-#include "components/ui_label_button_ext.h"
-#include "components/ui_chart.h"
-#include "components/ui_list.h"
-#include "components/icon_adapter.h"
 #include "wearable_log.h"
-#include "ohos_types.h"
-#include "components/ui_card_page.h"
+
 #include "traing/include/TraingModel.h"
 #include "traing/Training_UiConfig.h"
 #include "language/font/ui_resource_string.h"
@@ -218,23 +206,6 @@ namespace OHOS
         static TraingModel *GetInstance(void);
         void Init();
 
-        /* --------------------------------- 组件初始化 -------------------------------- */
-        /*初始化label[可使用text]*/
-        bool InitLabel(UILabelExt *&label, int left, int top, int width, int height, const char *viewId, const char *text, const char *fontName, int fontSize);
-        /*初始化labelExt*/
-        bool InitLabelExt(UILabelExt *&label, int left, int top, int width, int height, const char *viewId, UIResourceTextId id, const char *fontName, int fontSize);
-        /*初始化button*/
-        bool InitButton(UIButton *&button, int left, int top, int width, int height, const char *viewId);
-        /*初始化buttonExt*/
-        bool InitButtonExt(UILabelButtonExt *&button, int left, int top, int width, int height, const char *viewId, UIResourceTextId id, int fontSize);
-        /*初始化image*/
-        bool InitImageView(UIImageView *&imageView, int left, int top, int width, int height, const char *viewId, const char *imagePath);
-        /*生成动画资源数组*/
-        const char **CreateImagePathsArray(const char *basePath, const char *fileExtension, int numImages);
-        /*初始化动画资源*/
-        void InitImageAnimatorSource(UIImageAnimatorView *&imageAnimator, const char **imagePaths, int numFrames, int left, int top, int width, int height, const char *viewId, int time);
-        /* -------------------------------------------------------------------------- */
-
         /*定时器 */
         std::string DisplayMotionDuration();
         /*设置运动类型*/
index ae995ac..5c7c58c 100644 (file)
@@ -1,3 +1,9 @@
+/*** 
+ * @Date: 2024-04-15 10:55:58
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-04-23 20:29:54
+ * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalView.h
+ */
 #ifndef _TraingNomal_VIEW_H
 #define _TraingNomal_VIEW_H
 
@@ -18,6 +24,7 @@
 #include "ohos_types.h"
 #include "components/ui_card_page.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 
 #include "TraingNomalPresenter.h"
index 8afcd2d..07dfc6a 100644 (file)
@@ -20,6 +20,7 @@
 #include "components/icon_adapter.h"
 #include "wearable_log.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 
 #include "traing/include/TrainingSetCaluliView.h"
index 6029926..6b7dac6 100644 (file)
@@ -3,6 +3,7 @@
 #define _Traing_VIEW_H
 
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 #include "TraingPresenter.h"
 namespace OHOS
index 3975904..5edd7ee 100644 (file)
@@ -14,6 +14,7 @@
 #include "components/ui_label_button_ext.h"
 #include "wearable_log.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 #include "components/ui_picker.h"
 #include "components/ui_scroll_view.h"
index 719ca3e..412bdd4 100644 (file)
@@ -20,6 +20,7 @@
 #include "components/ui_label_button_ext.h"
 #include "wearable_log.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 #include "components/ui_picker.h"
 #include "components/ui_scroll_view.h"
index 1354f42..66862e0 100644 (file)
@@ -20,6 +20,7 @@
 #include "components/ui_label_button_ext.h"
 #include "wearable_log.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 #include "components/ui_picker.h"
 #include "components/ui_scroll_view.h"
index 271c299..27a3b6a 100644 (file)
@@ -14,6 +14,7 @@
 #include "components/ui_label_button_ext.h"
 #include "wearable_log.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 #include "components/ui_picker.h"
 #include "components/ui_scroll_view.h"
index 8f41f52..a0e1a30 100644 (file)
@@ -9,6 +9,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_button.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 #include <cmath>  // 包含数学函数库,用于四舍五入
 #include <string> // 包含字符串处理库,用于使用 std::to_string
@@ -59,13 +60,13 @@ namespace OHOS
         scrollView_->SetVisible(true);
 
         // 初始化image
-        TraingModel::GetInstance()->InitImageView(imageIcon, 80, 132, 54, 80, "image5", WALKING_54_IMAGE);
-        TraingModel::GetInstance()->InitImageView(imageLine2, 97, 214, 80, 20, "image6", LINE_IMAGE);
-        TraingModel::GetInstance()->InitImageView(imageLine3, 97, 344, 80, 20, "image8", LINE_IMAGE);
-        TraingModel::GetInstance()->InitImageView(imageLine4, 97, 474, 80, 20, "image9", LINE_IMAGE);
-        TraingModel::GetInstance()->InitImageView(imageLine5, 97, 604, 80, 20, "image10", LINE_IMAGE);
-        TraingModel::GetInstance()->InitImageView(imageLine6, 97, 734, 80, 20, "image11", LINE_IMAGE);
-        TraingModel::GetInstance()->InitImageView(imageLine7, 97, 864, 80, 20, "image12", LINE_IMAGE);
+        InitImageView(imageIcon, 80, 132, 54, 80, "image5", WALKING_54_IMAGE);
+        InitImageView(imageLine2, 97, 214, 80, 20, "image6", LINE_IMAGE);
+        InitImageView(imageLine3, 97, 344, 80, 20, "image8", LINE_IMAGE);
+        InitImageView(imageLine4, 97, 474, 80, 20, "image9", LINE_IMAGE);
+        InitImageView(imageLine5, 97, 604, 80, 20, "image10", LINE_IMAGE);
+        InitImageView(imageLine6, 97, 734, 80, 20, "image11", LINE_IMAGE);
+        InitImageView(imageLine7, 97, 864, 80, 20, "image12", LINE_IMAGE);
         scrollView_->Add(imageLine2);
         scrollView_->Add(imageLine3);
         scrollView_->Add(imageLine4);
@@ -76,16 +77,16 @@ namespace OHOS
 
         // 初始化Lable
         // 初始化标签
-        TraingModel::GetInstance()->InitLabel(labeltype, 188, 52, 90, 35, "label1", "健身类", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        TraingModel::GetInstance()->InitLabel(labelsport, 147, 140, 240, 35, "label6", "健走", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        TraingModel::GetInstance()->InitLabel(labelduration, 146, 179, 240, 40, "label7", "13:00:22-15:00:12", DEFAULT_VECTOR_FONT_FILENAME, 28);
-        TraingModel::GetInstance()->InitLabel(labelutag, 146, 252, 240, 40, "label8", "目标完成度", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        TraingModel::GetInstance()->InitLabel(labelutime, 146, 382, 240, 40, "label9", "训练时长", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        TraingModel::GetInstance()->InitLabel(labelumile, 146, 512, 240, 40, "label10", "距离(米)", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        TraingModel::GetInstance()->InitLabel(labeluheart, 146, 642, 240, 40, "label11", "平均心率(次/分)", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        TraingModel::GetInstance()->InitLabel(labelusteps, 146, 772, 240, 40, "label12", "步数", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        TraingModel::GetInstance()->InitLabel(labelustrong, 146, 902, 240, 40, "label2", "训练强度", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        TraingModel::GetInstance()->InitLabel(labelnote, 80, 1024, 300, 40, "label8", "更多请前往APP查看", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabel(labeltype, 188, 52, 90, 35, "label1", "健身类", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabel(labelsport, 147, 140, 240, 35, "label6", "健走", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabel(labelduration, 146, 179, 240, 40, "label7", "13:00:22-15:00:12", DEFAULT_VECTOR_FONT_FILENAME, 28);
+        InitLabel(labelutag, 146, 252, 240, 40, "label8", "目标完成度", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabel(labelutime, 146, 382, 240, 40, "label9", "训练时长", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabel(labelumile, 146, 512, 240, 40, "label10", "距离(米)", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabel(labeluheart, 146, 642, 240, 40, "label11", "平均心率(次/分)", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabel(labelusteps, 146, 772, 240, 40, "label12", "步数", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabel(labelustrong, 146, 902, 240, 40, "label2", "训练强度", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabel(labelnote, 80, 1024, 300, 40, "label8", "更多请前往APP查看", DEFAULT_VECTOR_FONT_FILENAME, 30);
 
         // 设置文本颜色
         labelduration->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x7f));
@@ -96,17 +97,17 @@ namespace OHOS
         labelustrong->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x7f));
         labelnote->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x7f));
 
-        TraingModel::GetInstance()->InitLabel(labeltag, 146, 292, 240, 60, "label18", "--", DEFAULT_VECTOR_FONT_FILENAME, 40);
+        InitLabel(labeltag, 146, 292, 240, 60, "label18", "--", DEFAULT_VECTOR_FONT_FILENAME, 40);
         labeltag->SetTextColor(Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff));
-        TraingModel::GetInstance()->InitLabel(labeltime, 146, 418, 240, 60, "label14", "05:45:46", DEFAULT_VECTOR_FONT_FILENAME, 40);
+        InitLabel(labeltime, 146, 418, 240, 60, "label14", "05:45:46", DEFAULT_VECTOR_FONT_FILENAME, 40);
         labeltime->SetTextColor(Color::GetColorFromRGBA(0xff, 0x8a, 0x36, 0xff));
-        TraingModel::GetInstance()->InitLabel(labelmile, 146, 548, 240, 60, "label15", "8,301", DEFAULT_VECTOR_FONT_FILENAME, 40);
+        InitLabel(labelmile, 146, 548, 240, 60, "label15", "8,301", DEFAULT_VECTOR_FONT_FILENAME, 40);
         labelmile->SetTextColor(Color::GetColorFromRGBA(0x36, 0x4a, 0xff, 0xff));
-        TraingModel::GetInstance()->InitLabel(labelheart, 146, 678, 240, 60, "label16", "144", DEFAULT_VECTOR_FONT_FILENAME, 40);
+        InitLabel(labelheart, 146, 678, 240, 60, "label16", "144", DEFAULT_VECTOR_FONT_FILENAME, 40);
         labelheart->SetTextColor(Color::GetColorFromRGBA(0xff, 0x5a, 0x36, 0xff));
-        TraingModel::GetInstance()->InitLabel(labelsteps, 146, 808, 240, 60, "label16", "5000", DEFAULT_VECTOR_FONT_FILENAME, 40);
+        InitLabel(labelsteps, 146, 808, 240, 60, "label16", "5000", DEFAULT_VECTOR_FONT_FILENAME, 40);
         labelsteps->SetTextColor(Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff));
-        TraingModel::GetInstance()->InitLabel(labelstrong, 146, 938, 240, 60, "label17", "中等强度", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabel(labelstrong, 146, 938, 240, 60, "label17", "中等强度", DEFAULT_VECTOR_FONT_FILENAME, 30);
         labelstrong->SetTextColor(Color::GetColorFromRGBA(0xff, 0x5a, 0x36, 0xff));
 
         scrollView_->Add(labeltype);
@@ -128,7 +129,7 @@ namespace OHOS
         scrollView_->Add(labelsteps);
 
         // 初始化button
-        TraingModel::GetInstance()->InitButtonExt(buttonexit, 42, 1111, 380, 100, BUTTONBACK, STR_OFF, 30);
+        InitButtonExt(buttonexit, 42, 1111, 380, 100, BUTTONBACK, STR_OFF, 30);
         buttonexit->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingEnddataPresenter::GetInstance()));
         scrollView_->Add(buttonexit);
     }
@@ -312,7 +313,7 @@ namespace OHOS
         labelmile->SetText(mileStr.c_str());
 
         // 平均心率
-        // int heart = TraingModel::GetInstance()->CalculateAverageHeartRate(155); // 设置一个测试值
+        // int heart = CalculateAverageHeartRate(155); // 设置一个测试值
         std::string heartStr = std::to_string(enddata->avgheart);
         labelheart->SetText(heartStr.c_str());
 
index 4f0d9f6..342e563 100644 (file)
@@ -5,6 +5,7 @@
  * @FilePath: /sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
  */
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "wearable_log.h"
 #include <iostream>
 #include <string>
@@ -188,248 +189,7 @@ namespace OHOS
         TraingSubscribeTopic(TOPIC_EVENT_ACTIVITY_UPDATE); // 进行消息订阅
         TraingSubscribeTopic(TOPIC_EVENT_BLE_TRAINING);
     }
-    /***
-     * @description: 初始化标签
-     * @param {UILabel} *
-     * @param {int} left
-     * @param {int} top
-     * @param {int} width
-     * @param {int} height
-     * @param {char} *viewId
-     * @param {char} *text
-     * @param {char} *fontName
-     * @param {int} fontSize
-     * @return
-     * @brief 初始化标签
-     */
-    bool TraingModel::InitLabel(UILabelExt *&label, int left, int top, int width, int height, const char *viewId, const char *text, const char *fontName, int fontSize)
-    {
-        // 检查标签指针是否为空
-        if (label == nullptr)
-        {
-            label = new UILabelExt();
-        }
-        if (label == nullptr)
-        {
-            return false; // 内存分配失败,返回false
-        }
-        // 设置标签的位置和大小
-        label->SetPosition(left, top);
-        label->Resize(width, height);
-        // 设置标签的视图 ID
-        label->SetViewId(viewId);
-        // 设置标签的样式
-        label->SetStyle(STYLE_TEXT_FONT, fontSize);
-        label->SetFont(fontName, fontSize);
-        // 设置标签的文本和其他属性
-        label->SetText(text);
-        label->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
-        label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-        label->SetRollSpeed(0);
-        // 设置标签可见
-        label->SetVisible(true);
-        // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingModel::InitLabelExt is succeed");
-        return true;
-    }
-
-    /***
-     * @description:
-     * @param {UILabelExt} *
-     * @param {int} left
-     * @param {int} top
-     * @param {int} width
-     * @param {int} height
-     * @param {char} *viewId
-     * @param {char} *text
-     * @param {char} *fontName
-     * @param {int} fontSize
-     * @return {*}
-     * @brief 初始化多国语言标签
-     */
-    bool TraingModel::InitLabelExt(UILabelExt *&label, int left, int top, int width, int height, const char *viewId, UIResourceTextId id, const char *fontName, int fontSize)
-    {
-        // 检查标签指针是否为空
-        if (label == nullptr)
-        {
-            label = new UILabelExt();
-        }
-        if (label == nullptr)
-        {
-            return false; // 内存分配失败,返回false
-        }
-        // 设置标签的位置和大小
-        label->SetPosition(left, top);
-        label->Resize(width, height);
-        // 设置标签的视图 ID
-        label->SetViewId(viewId);
-        // 设置标签的样式
-        label->SetStyle(STYLE_TEXT_FONT, fontSize);
-        label->SetFont(fontName, fontSize);
-        // 设置标签的文本和其他属性
-        label->SetTextId(id);
-        // label->SetFontId();
-        label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-        label->SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
-        label->SetRollSpeed(100);
-        // 设置标签可见
-        label->SetVisible(true);
-        // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingModel::InitLabelExt is succeed");
-        return true;
-    }
-    /***
-     * @description:
-     * @param {UIButton} *
-     * @param {int} left
-     * @param {int} top
-     * @param {int} width
-     * @param {int} height
-     * @param {char} *viewId
-     * @return
-     * @brief 初始化按钮
-     */
-    bool TraingModel::InitButton(UIButton *&button, int left, int top, int width, int height, const char *viewId)
-    {
-        // 创建新按钮(如果当前按钮为空)
-        if (button == nullptr)
-        {
-            button = new UIButton();
-        }
-        if (button == nullptr)
-        {
-            return false; // 内存分配失败,返回false
-        }
-        button->SetPosition(left, top);
-        button->Resize(width, height);
-        button->SetViewId(viewId);
-        button->SetStyle(STYLE_BACKGROUND_COLOR, DEFAULT_BACKGROUND_COLOR);
-        button->SetStyleForState(STYLE_BACKGROUND_COLOR, DEFAULT_BACKGROUND_COLOR, UIButton::PRESSED);
-        button->SetStyleForState(STYLE_BORDER_COLOR, PRESSED_BORDER_COLOR, UIButton::PRESSED);
-        button->SetVisible(true);
-        // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingModel::InitButton is succeed");
-        return true;
-    }
-    bool TraingModel::InitButtonExt(UILabelButtonExt *&button, int left, int top, int width, int height, const char *viewId, UIResourceTextId id, int fontSize)
-    {
-        // 创建新按钮(如果当前按钮为空)
-        if (button == nullptr)
-        {
-            button = new UILabelButtonExt();
-        }
-        if (button == nullptr)
-        {
-            return false; // 内存分配失败,返回false
-        }
-        button->SetPosition(left, top);
-        button->Resize(width, height);
-        button->SetViewId(viewId);
-        button->SetTextId(id);
-
-        button->SetStyle(STYLE_TEXT_FONT, fontSize);
-        button->SetFont(DEFAULT_VECTOR_FONT_FILENAME, fontSize);
-
-        button->SetStyle(STYLE_BACKGROUND_COLOR, DEFAULT_BACKGROUND_COLOR);
-        button->SetStyleForState(STYLE_BACKGROUND_COLOR, DEFAULT_BACKGROUND_COLOR, UIButton::PRESSED);
-        button->SetStyleForState(STYLE_BORDER_COLOR, PRESSED_BORDER_COLOR, UIButton::PRESSED);
-        button->SetVisible(true);
-        // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingModel::InitButton is succeed");
-        return true;
-    }
-    /***
-     * @description:
-     * @param {UIImageView} *
-     * @param {int} left
-     * @param {int} top
-     * @param {int} width
-     * @param {int} height
-     * @param {char} *viewId
-     * @param {char} *imagePath
-     * @return {*}
-     * @brief 初始化图片
-     */
-    bool TraingModel::InitImageView(UIImageView *&imageView, int left, int top, int width, int height, const char *viewId, const char *imagePath)
-    {
-        if (imageView == nullptr)
-        {
-            imageView = new UIImageView();
-        }
-        if (imageView == nullptr)
-        {
-            return false; // 内存分配失败,返回false
-        }
-        imageView->SetPosition(left, top);
-        imageView->SetAutoEnable(true);
-        // imageView->Resize(width, height);
-        imageView->SetViewId(viewId);
-        imageView->SetSrc(imagePath);
-        imageView->SetVisible(true);
-        // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingModel::InitImageView is succeed");
-        return true;
-    }
-    /**
-     * 创建包含图片文件路径的数组
-     * @param  basePath  包含图片文件的基本路径
-     * @param  fileExtension  图片文件的扩展名
-     * @param  numImages  图片文件的数量
-     * @return  返回包含图片文件路径的数组
-     */
-    const char **TraingModel::CreateImagePathsArray(const char *basePath, const char *fileExtension, int numImages)
-    {
-        const char **imagePaths = new const char *[numImages];
-        char buffer[256];
-        for (int i = 0; i < numImages; i++)
-        {
-            snprintf(buffer, sizeof(buffer), "%s/%d.%s", basePath, i + 1, fileExtension);
-            imagePaths[i] = strdup(buffer);
-        }
-        return imagePaths;
-    }
-    /**
-     * @brief 初始化UIImageAnimatorView,并设置为GIF动画。
-     *
-     * 该函数用于使用提供的GIF图像和属性初始化UIImageAnimatorView。
-     *
-     * @param imageAnimator 要初始化的UIImageAnimatorView对象的引用。
-     * @param paths GIF图像文件路径的数组。
-     * @param numFrames GIF中的帧数。
-     * @param left 视图的左侧位置。
-     * @param top 视图的顶部位置。
-     * @param width 视图的宽度。
-     * @param height 视图的高度。
-     * @param viewId 视图的ID。
-     * @param time 视图的帧速
-     * @return 如果初始化成功则返回true,否则返回false。
-     */
-    void TraingModel::InitImageAnimatorSource(UIImageAnimatorView *&imageAnimator, const char **imagePaths, int numFrames, int left, int top, int width, int height, const char *viewId, int time)
-    {
-        if (imageAnimator == nullptr)
-        {
-            imageAnimator = new UIImageAnimatorView();
-        }
-        imageAnimator->SetPosition(left, top);
-        imageAnimator->Resize(width, height);
-        imageAnimator->SetViewId(viewId);
-        imageAnimator->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);
-        imageAnimator->SetStyle(STYLE_BACKGROUND_OPA, 0xff);
-
-        ImageAnimatorInfo *imageAnimatorInfo = new ImageAnimatorInfo[numFrames];
-        for (int i = 0; i < numFrames; i++)
-        {
-            imageAnimatorInfo[i].imagePath = imagePaths[i];
-            imageAnimatorInfo[i].pos.x = left;
-            imageAnimatorInfo[i].pos.y = top;
-            imageAnimatorInfo[i].width = width;
-            imageAnimatorInfo[i].height = height;
-            imageAnimatorInfo[i].imageType = IMG_SRC_FILE_PATH;
-        }
-
-        imageAnimator->SetImageAnimatorSrc(imageAnimatorInfo, numFrames, time); // 200 is the default delay time
-        imageAnimator->SetTimeOfPause(time);
-        imageAnimator->SetRepeatTimes(1);
-        imageAnimator->SetReverse(true);
-        // imageAnimator->SetVisible(true);
-    }
-    /* -------------------------------------------------------------------------- */
-    /*设置运动类型*/
+     /*设置运动类型*/
     void TraingModel::SetSportType(Exercisetype type)
     {
         sportType_ = type;
index 037a778..2adc8a9 100644 (file)
@@ -9,6 +9,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_button.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 
 namespace OHOS
@@ -45,14 +46,14 @@ namespace OHOS
 
         UIResourceTextId sport_id = TraingModel::GetInstance()->GetSportEvent();
         // 初始化Lable
-        TraingModel::GetInstance()->InitLabelExt(sporttitle_, 137, 52, 200, 80, "label1", sport_id, DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(sporttitle_, 137, 52, 200, 80, "label1", sport_id, DEFAULT_VECTOR_FONT_FILENAME, 30);
         container_->Add(sporttitle_);
         // 初始化Button
-        TraingModel::GetInstance()->InitButton(buttonGo_, 133, 133, 200, 200, BUTTONGO);
+        InitButton(buttonGo_, 133, 133, 200, 200, BUTTONGO);
         // Set additional property
         buttonGo_->SetImageSrc(GO_1_IMAGE, GO_1_IMAGE);
 
-        TraingModel::GetInstance()->InitButtonExt(buttonSet_, 160, 370, 150, 50, BUTTONSET, STR_SET_GOALS, 30);
+        InitButtonExt(buttonSet_, 160, 370, 150, 50, BUTTONSET, STR_SET_GOALS, 30);
         buttonSet_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000); // 设置为透明按键
         buttonSet_->SetStyle(STYLE_BACKGROUND_OPA, 0x00);
         buttonSet_->SetStyleForState(STYLE_BACKGROUND_OPA, 0x80, UIButton::PRESSED); // 设置按下时的透明度为半透明
index f936c45..e318c43 100644 (file)
@@ -15,6 +15,7 @@
 #include <thread>
 #include "traing/include/TraingPresenter.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 // #include "TraingView.h"
 
 namespace OHOS
index 1730462..054c104 100644 (file)
@@ -15,6 +15,7 @@
 #include "traing/include/TraingSetPresenter.h"\r
 #include "traing/training_card/include/TraingCardPresenter.h"\r
 #include "traing/include/TraingModel.h"\r
+#include "uicomponents/UIComponents.h"\r
 // #include "TraingSetView.h"\r
 \r
 #define TAGTEST 0\r
index e43bca5..396ca94 100644 (file)
@@ -9,6 +9,7 @@
 #include <ui_scroll_view.h>\r
 #include "components/ui_button.h"\r
 #include "traing/include/TraingModel.h"\r
+#include "uicomponents/UIComponents.h"\r
 #include "traing/Training_UiConfig.h"\r
 \r
 namespace OHOS\r
@@ -43,13 +44,13 @@ namespace OHOS
             SetTagScrollView[SET_VIEW]->SetStyle(STYLE_BACKGROUND_OPA, 0);\r
         }\r
         //  初始化Button\r
-        TraingModel::GetInstance()->InitButton(butTime, 43, 120, 380, 100, BUTTONTIME);\r
-        TraingModel::GetInstance()->InitButton(butKcal, 43, 240, 380, 100, BUTTONCALULI);\r
+        InitButton(butTime, 43, 120, 380, 100, BUTTONTIME);\r
+        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
+        InitButton(butDistance, 43, 360, 380, 100, BUTTONDISTANCE);\r
+        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
@@ -59,11 +60,11 @@ namespace OHOS
         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
-        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
+        InitLabelExt(labeltitle, 83, 50, 300, 35, "label1", sportid, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        InitLabel(labelTime, 100, 150, 150, 35, "label2", "时长", DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        InitLabel(labelKcal, 100, 270, 150, 35, "label4", "卡路里", DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        InitLabel(labelDistance, 100, 390, 150, 35, "label3", "距离", DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        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
@@ -72,15 +73,15 @@ namespace OHOS
         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
+        InitImageView(imagetime, 70, 150, 100, 100, "image1", TIME_IMAGE);\r
+        InitImageView(imagcal, 70, 270, 100, 100, "image2", CALORIES_IMAGE);\r
+        InitImageView(imagedistance, 70, 390, 100, 100, "image5", MILEAGE_IMAGE);\r
+        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(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
+        InitImageView(imagicon1, 380, 160, 100, 100, "image3", ICON_IMAGE);\r
+        InitImageView(imagicon2, 380, 280, 100, 100, "image4", ICON_IMAGE);\r
+        InitImageView(imagicon3, 380, 400, 100, 100, "image3", ICON_IMAGE);\r
+        InitImageView(imagicon4, 380, 520, 100, 100, "image4", ICON_IMAGE);\r
 \r
         SetTagScrollView[SET_VIEW]->Add(imagetime);\r
         SetTagScrollView[SET_VIEW]->Add(imagcal);\r
index 747ca81..7f93aa5 100644 (file)
@@ -71,33 +71,33 @@ namespace OHOS
     {\r
         // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingModel::AddLabel");\r
         //  初始化标签\r
-        TraingModel::GetInstance()->InitLabelExt(title_label, TITLE_LABEL_X, TITLE_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "title_label", STR_RAPID_TRAINING, DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE);\r
+        InitLabelExt(title_label, TITLE_LABEL_X, TITLE_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "title_label", STR_RAPID_TRAINING, DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE);\r
 \r
-        TraingModel::GetInstance()->InitLabelExt(btn1_label, BTN1_LABEL_X, BTN1_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "btu1_label", STR_EXERCISE_OUTDOORWALKING, DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE);\r
-        TraingModel::GetInstance()->InitLabelExt(btn2_label, BTN2_LABEL_X, BTN2_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "btu2_label", STR_EXERCISE_OUTDOORBIKING, DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE);\r
-        TraingModel::GetInstance()->InitLabelExt(btn3_label, BTN3_LABEL_X, BTN3_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "btu3_label", STR_EXERCISE_OUTDOORRUNNING, DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE);\r
-        TraingModel::GetInstance()->InitLabelExt(btnmore_label, BTN2_LABEL_X, BTN3_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "btumore_label", STR_MORE, DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE);\r
+        InitLabelExt(btn1_label, BTN1_LABEL_X, BTN1_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "btu1_label", STR_EXERCISE_OUTDOORWALKING, DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE);\r
+        InitLabelExt(btn2_label, BTN2_LABEL_X, BTN2_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "btu2_label", STR_EXERCISE_OUTDOORBIKING, DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE);\r
+        InitLabelExt(btn3_label, BTN3_LABEL_X, BTN3_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "btu3_label", STR_EXERCISE_OUTDOORRUNNING, DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE);\r
+        InitLabelExt(btnmore_label, BTN2_LABEL_X, BTN3_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "btumore_label", STR_MORE, DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE);\r
         return true;\r
     }\r
 \r
     bool TraingView::AddButton()\r
     {\r
-        TraingModel::GetInstance()->InitButton(button1_, BUTTON1_X, BUTTON1_Y, BUTTON_WIDHT, BUTTON_HEIGHT, BUTTON1);\r
+        InitButton(button1_, BUTTON1_X, BUTTON1_Y, BUTTON_WIDHT, BUTTON_HEIGHT, BUTTON1);\r
         button1_->SetImageSrc(BUTTONGROUND2_IMAGE, BUTTONGROUND2_IMAGE);\r
         UIView::OnClickListener *button1Click = static_cast<UIView::OnClickListener *>(TraingPresenter::GetInstance());\r
         button1_->SetOnClickListener(button1Click);\r
 \r
-        TraingModel::GetInstance()->InitButton(button2_, BUTTON2_X, BUTTON2_Y, BUTTON_WIDHT, BUTTON_HEIGHT, BUTTON2);\r
+        InitButton(button2_, BUTTON2_X, BUTTON2_Y, BUTTON_WIDHT, BUTTON_HEIGHT, BUTTON2);\r
         button2_->SetImageSrc(BOUTTONGROUND_IMAGE, BOUTTONGROUND_IMAGE);\r
         UIView::OnClickListener *button2Click = static_cast<UIView::OnClickListener *>(TraingPresenter::GetInstance());\r
         button2_->SetOnClickListener(button2Click);\r
 \r
-        TraingModel::GetInstance()->InitButton(button3_, BUTTON3_X, BUTTON3_Y, BUTTON_WIDHT, BUTTON_HEIGHT, BUTTON3);\r
+        InitButton(button3_, BUTTON3_X, BUTTON3_Y, BUTTON_WIDHT, BUTTON_HEIGHT, BUTTON3);\r
         button3_->SetImageSrc(BOUTTONGROUND_IMAGE, BOUTTONGROUND_IMAGE);\r
         UIView::OnClickListener *button3Click = static_cast<UIView::OnClickListener *>(TraingPresenter::GetInstance());\r
         button3_->SetOnClickListener(button3Click);\r
 \r
-        TraingModel::GetInstance()->InitButton(buttonmore_, BUTTONMORE_X, BUTTONMORE_Y, BUTTON_WIDHT, BUTTON_HEIGHT, BUTTONMORE);\r
+        InitButton(buttonmore_, BUTTONMORE_X, BUTTONMORE_Y, BUTTON_WIDHT, BUTTON_HEIGHT, BUTTONMORE);\r
         buttonmore_->SetImageSrc(BUTTONGROUND2_IMAGE, BUTTONGROUND2_IMAGE);\r
         UIView::OnClickListener *button4Click = static_cast<UIView::OnClickListener *>(TraingPresenter::GetInstance());\r
         buttonmore_->SetOnClickListener(button4Click);\r
@@ -112,10 +112,10 @@ namespace OHOS
     bool TraingView::AddImageView()\r
     {\r
 \r
-        TraingModel::GetInstance()->InitImageView(btn1_image, BTN1_IMAGE_X, BTN1_IMAGE_Y, BTN_IMAGE_SIZE, BTN_IMAGE_SIZE, "btn1_image", WALKING_60_IMAGE);\r
-        TraingModel::GetInstance()->InitImageView(btn2_image, BTN2_IMAGE_X, BTN2_IMAGE_Y, BTN_IMAGE_SIZE, BTN_IMAGE_SIZE, "btn2_image", RIDING_60_IMAGE);\r
-        TraingModel::GetInstance()->InitImageView(btn3_image, BTN3_IMAGE_X, BTN3_IMAGE_Y, BTN_IMAGE_SIZE, BTN_IMAGE_SIZE, "btn3_image", RUNNING_60_IMAGE);\r
-        TraingModel::GetInstance()->InitImageView(btnmore_image, BTNMORE_IMAGE_X, BTNMORE_IMAGE_Y, BTN_IMAGE_SIZE, BTN_IMAGE_SIZE, "btnmore_image", MORE_ICON_IMAGE);\r
+        InitImageView(btn1_image, BTN1_IMAGE_X, BTN1_IMAGE_Y, BTN_IMAGE_SIZE, BTN_IMAGE_SIZE, "btn1_image", WALKING_60_IMAGE);\r
+        InitImageView(btn2_image, BTN2_IMAGE_X, BTN2_IMAGE_Y, BTN_IMAGE_SIZE, BTN_IMAGE_SIZE, "btn2_image", RIDING_60_IMAGE);\r
+        InitImageView(btn3_image, BTN3_IMAGE_X, BTN3_IMAGE_Y, BTN_IMAGE_SIZE, BTN_IMAGE_SIZE, "btn3_image", RUNNING_60_IMAGE);\r
+        InitImageView(btnmore_image, BTNMORE_IMAGE_X, BTNMORE_IMAGE_Y, BTN_IMAGE_SIZE, BTN_IMAGE_SIZE, "btnmore_image", MORE_ICON_IMAGE);\r
         return true;\r
     }\r
     void TraingView::InitView()\r
index fe01c91..0797a65 100644 (file)
@@ -1,7 +1,7 @@
-/*** 
+/***
  * @Date: 2024-04-18 10:57:22
  * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-04-18 16:35:33
+ * @LastEditTime: 2024-04-25 10:44:58
  * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetCaluliView.cpp
  */
 /***
@@ -24,6 +24,7 @@
 #include <string>
 #include <vector>
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 namespace OHOS
 {
@@ -172,16 +173,16 @@ namespace OHOS
         SetCaluliScrollView->SetTouchable(true);
         SetCaluliScrollView->SetDraggable(true);
         SetCaluliScrollView->SetVerticalScrollState(false); // 禁止垂直滑动
-        /* -------------------------------------------------------------------------- */
-        // 初始化Lable
-        TraingModel::GetInstance()->InitLabel(labeltitle_, 83, 50, 300, 35, "label1", "卡路里(千卡)", DEFAULT_VECTOR_FONT_FILENAME, 30);
+                                                            /* -------------------------------------------------------------------------- */
+                                                            // 初始化Lable
+        InitLabel(labeltitle_, 83, 50, 300, 35, "label1", "卡路里(千卡)", DEFAULT_VECTOR_FONT_FILENAME, 30);
         SetCaluliScrollView->Add(labeltitle_);
 
         // 初始化UIPicker
         InitUIPicker(Picker_, 43, 106, 380, 240, "uiPicker");
         SetCaluliScrollView->Add(Picker_);
         //  初始化Button
-        TraingModel::GetInstance()->InitButtonExt(buttonok_, 0, 366, 466, 100, BUTTONCALULIOK, STR_OK, 30);
+        InitButtonExt(buttonok_, 0, 366, 466, 100, BUTTONCALULIOK, STR_OK, 30);
         // Set additional property
         buttonok_->SetImageSrc(BUTTONOK_IMAGE, BUTTONOK_IMAGE);
         buttonok_->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingSetPresenter::GetInstance()));
index 9e5f239..63d65fe 100644 (file)
@@ -18,6 +18,7 @@
 #include <string>
 #include <vector>
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 namespace OHOS
 {
@@ -168,14 +169,14 @@ namespace OHOS
         SetMileScrollView->SetVerticalScrollState(false); // 禁止垂直滑动
         /* -------------------------------------------------------------------------- */
         // 初始化Lable
-        TraingModel::GetInstance()->InitLabel(labeltitle_, 83, 50, 300, 35, "label1", "距离(公里)", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabel(labeltitle_, 83, 50, 300, 35, "label1", "距离(公里)", DEFAULT_VECTOR_FONT_FILENAME, 30);
         SetMileScrollView->Add(labeltitle_);
 
         // 初始化UIPicker
         InitUIPicker(Picker_, 43, 106, 380, 240, "uiPicker");
         SetMileScrollView->Add(Picker_);
         //  初始化Button
-        TraingModel::GetInstance()->InitButtonExt(buttonok_, 0, 366, 466, 100, BUTTONMILEOK, STR_OK, 30);
+        InitButtonExt(buttonok_, 0, 366, 466, 100, BUTTONMILEOK, STR_OK, 30);
         // Set additional property
         buttonok_->SetImageSrc(BUTTONOK_IMAGE, BUTTONOK_IMAGE);
         buttonok_->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingSetPresenter::GetInstance()));
index 92e6dec..cdffebd 100644 (file)
@@ -18,6 +18,7 @@
 #include <string>
 #include <vector>
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 namespace OHOS
 {
@@ -168,14 +169,14 @@ namespace OHOS
         SetStepScrollView->SetVerticalScrollState(false); // 禁止垂直滑动
         /* -------------------------------------------------------------------------- */
         // 初始化Lable
-        TraingModel::GetInstance()->InitLabel(labeltitle_, 83, 50, 300, 35, "label1", "步数(步)", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabel(labeltitle_, 83, 50, 300, 35, "label1", "步数(步)", DEFAULT_VECTOR_FONT_FILENAME, 30);
         SetStepScrollView->Add(labeltitle_);
 
         // 初始化UIPicker
         InitUIPicker(Picker_, 43, 106, 380, 240, "uiPicker");
         SetStepScrollView->Add(Picker_);
         //  初始化Button
-        TraingModel::GetInstance()->InitButtonExt(buttonok_, 0, 366, 466, 100, BUTTONSTEPOK, STR_OK, 30);
+        InitButtonExt(buttonok_, 0, 366, 466, 100, BUTTONSTEPOK, STR_OK, 30);
         // Set additional property
         buttonok_->SetImageSrc(BUTTONOK_IMAGE, BUTTONOK_IMAGE);
         buttonok_->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingSetPresenter::GetInstance()));
index d6914fd..188fe3b 100644 (file)
@@ -18,6 +18,7 @@
 #include <string>
 #include <vector>
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 namespace OHOS
 {
@@ -168,14 +169,14 @@ namespace OHOS
         SetTimeScrollView->SetVerticalScrollState(false); // 禁止垂直滑动
         /* -------------------------------------------------------------------------- */
         // 初始化Lable
-        TraingModel::GetInstance()->InitLabel(labeltitle_, 83, 50, 300, 35, "label1", "时长(分钟)", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabel(labeltitle_, 83, 50, 300, 35, "label1", "时长(分钟)", DEFAULT_VECTOR_FONT_FILENAME, 30);
         SetTimeScrollView->Add(labeltitle_);
 
         // 初始化UIPicker
         InitUIPicker(Picker_, 43, 106, 380, 240, "uiPicker");
         SetTimeScrollView->Add(Picker_);
         //  初始化Button
-        TraingModel::GetInstance()->InitButtonExt(buttonok_, 0, 366, 466, 100, BUTTONTIMEOK, STR_OK, 30);
+        InitButtonExt(buttonok_, 0, 366, 466, 100, BUTTONTIMEOK, STR_OK, 30);
         // Set additional property
         buttonok_->SetImageSrc(BUTTONOK_IMAGE, BUTTONOK_IMAGE);
         buttonok_->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingSetPresenter::GetInstance()));
index 234fcd1..9fdcb5f 100644 (file)
@@ -18,6 +18,7 @@
 #include "ohos_types.h"
 #include "components/ui_card_page.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 
 #include "TraingGPSPresenter.h"
index 060abba..f8351ab 100644 (file)
 #include "ohos_types.h"
 #include "components/ui_card_page.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 #include "TraingGPSbackPresenter.h"
 namespace OHOS
index bd41450..dd8cfd3 100644 (file)
 #include "ohos_types.h"
 #include "components/ui_card_page.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 
 #include "TraingGPSlackPresenter.h"
index 363b696..74329b3 100644 (file)
 #include "ohos_types.h"
 #include "components/ui_card_page.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 #include "TraingGPSlostPresenter.h"
 namespace OHOS
index 333aa0b..eb282d7 100644 (file)
@@ -19,6 +19,7 @@
 #include "ohos_types.h"
 #include "components/ui_card_page.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 
 #include "TraingGPSnotePresenter.h"
index e0f752d..30c403e 100644 (file)
@@ -18,6 +18,7 @@
 #include "ohos_types.h"
 #include "components/ui_card_page.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 
 #include "TraingGPSsetPresenter.h"
index b769a1d..ba08302 100644 (file)
@@ -9,6 +9,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_button.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 
 namespace OHOS
index 4988f27..0a9d123 100644 (file)
@@ -9,6 +9,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_button.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 namespace OHOS
 {
index a0a2fb3..63f9e93 100644 (file)
@@ -9,6 +9,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_button.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 
 namespace OHOS
index 8839621..8ff2a11 100644 (file)
@@ -9,6 +9,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_button.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 namespace OHOS
 {
index 6d12064..d42dd93 100644 (file)
@@ -9,6 +9,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_button.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 
 namespace OHOS
index 851942c..62f6182 100644 (file)
@@ -9,6 +9,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_button.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 
 namespace OHOS
index 1193902..c8a69b2 100644 (file)
@@ -1,7 +1,7 @@
 /*** \r
  * @Date: 2024-04-15 11:46:23\r
  * @LastEditors: Caisking 3449750381@qq.com\r
- * @LastEditTime: 2024-04-23 11:00:11\r
+ * @LastEditTime: 2024-04-25 10:52:21\r
  * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h\r
  */\r
 #ifndef _TraingCard_VIEW_H\r
 #include "ohos_types.h"\r
 #include "components/ui_card_page.h"\r
 #include "traing/include/TraingModel.h"\r
+#include "uicomponents/UIComponents.h"\r
 #include "traing/Training_UiConfig.h"\r
 #include "components/ui_swipe_view.h"\r
 #include "components/ui_cross_view.h"\r
 \r
 #include "traing/include/TraingModel.h"\r
+#include "uicomponents/UIComponents.h"\r
 #include "traing/Training_UiConfig.h"\r
 #include "traing/training_card/include/TraingCardPresenter.h"\r
 \r
@@ -83,7 +85,7 @@ namespace OHOS
         void InitList();\r
         void PreLoad(void);\r
 \r
-        void InitImageAnimatorSource();\r
+        void InitImageAnimator();\r
         void ShowGetTagView();\r
         void ShowEndView();\r
         bool RefreshEndView();\r
index b12fbab..9265a1e 100644 (file)
 #include "ohos_types.h"
 #include "components/ui_card_page.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 
 #include "traing/training_card/include/TrainingDataView.h"
index e961bbe..84566bf 100644 (file)
 #include "ohos_types.h"
 #include "components/ui_card_page.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 
 #include "traing/training_card/include/TrainingDetailView.h"
index 8c33cd2..d85f1d2 100644 (file)
@@ -11,6 +11,7 @@
 #include "traing/training_card/include/TraingCardPresenter.h"\r
 #include "traing/training_card/include/TrainingControlView.h"\r
 #include "traing/include/TraingModel.h"\r
+#include "uicomponents/UIComponents.h"\r
 #include "custom_utils.h"\r
 #include "vibrator_service.h"\r
 #include <iomanip>\r
index acc1ec2..be920a3 100644 (file)
@@ -15,6 +15,7 @@
 #include "font/ui_font.h"\r
 \r
 #include "traing/include/TraingModel.h"\r
+#include "uicomponents/UIComponents.h"\r
 #include "custom_utils.h"\r
 \r
 extern "C"\r
@@ -286,16 +287,16 @@ namespace OHOS
         endView->SetReboundSize(50);\r
         endView->SetDirection(1);\r
 \r
-        TraingModel::GetInstance()->InitLabel(endtitle, 83, 50, 300, 35, "label1", "注意", DEFAULT_VECTOR_FONT_FILENAME, 30);\r
-        TraingModel::GetInstance()->InitLabel(notelabel, 56, 167, 360, 80, "label2", "当前运动量过少,无法记录 是否结束运动", DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        InitLabel(endtitle, 83, 50, 300, 35, "label1", "注意", DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        InitLabel(notelabel, 56, 167, 360, 80, "label2", "当前运动量过少,无法记录 是否结束运动", DEFAULT_VECTOR_FONT_FILENAME, 30);\r
 \r
         endView->Add(endtitle);\r
         endView->Add(notelabel);\r
 \r
-        TraingModel::GetInstance()->InitButton(exit, 111, 299, 100, 100, BUTTONBACK);\r
+        InitButton(exit, 111, 299, 100, 100, BUTTONBACK);\r
         exit->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingCardPresenter::GetInstance()));\r
         exit->SetImageSrc(NO_IMAGE, NO_IMAGE);\r
-        TraingModel::GetInstance()->InitButton(back, 256, 299, 100, 100, BUTTONEXIT);\r
+        InitButton(back, 256, 299, 100, 100, BUTTONEXIT);\r
         back->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingCardPresenter::GetInstance()));\r
         back->SetImageSrc(YES_IMAGE, YES_IMAGE);\r
         endView->Add(exit);\r
@@ -355,7 +356,7 @@ namespace OHOS
     }\r
 \r
     /*初始化动画以及Taglabel*/\r
-    void TraingCardView::InitImageAnimatorSource()\r
+    void TraingCardView::InitImageAnimator()\r
     {\r
         int tag = TraingModel::GetInstance()->GetSportTag();\r
         ExerciseTag tagType = TraingModel::GetInstance()->GetSportTagtype();\r
@@ -390,15 +391,15 @@ namespace OHOS
             break;\r
         }\r
         PRINT("tag[%d]-tagType[%d]-tagString[%s]\r\n", tag, tagType, tagString.c_str());\r
-        TraingModel::GetInstance()->InitLabel(labeltag, 70, 215, 326, 97, "label2", tagString.c_str(), DEFAULT_VECTOR_FONT_FILENAME, 80);\r
+        InitLabel(labeltag, 70, 215, 326, 97, "label2", tagString.c_str(), DEFAULT_VECTOR_FONT_FILENAME, 80);\r
         labeltag->SetTextColor(Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff));\r
         getView->Add(labeltag);\r
 \r
         // 初始化图片数组以及动画\r
         const char *basePath = "/user/res/Training/training_GIF/win/";\r
         const char *fileExtension = "bin";\r
-        const char **imagePaths = TraingModel::GetInstance()->CreateImagePathsArray(basePath, fileExtension, 94);\r
-        TraingModel::GetInstance()->InitImageAnimatorSource(imageAnimator, imagePaths, 94, 173, 100, 120, 120, "imageAnimator1", 10);\r
+        const char **imagePaths = CreateImagePathsArray(basePath, fileExtension, 94);\r
+        InitImageAnimatorSource(imageAnimator, imagePaths, 94, 173, 100, 120, 120, "imageAnimator1", 10);\r
         getView->Add(imageAnimator);\r
     }\r
 \r
@@ -418,21 +419,21 @@ namespace OHOS
         getView->SetDirection(1);\r
 \r
         // 初始化Lable\r
-        TraingModel::GetInstance()->InitLabel(labeltitle, 83, 50, 300, 35, "label1", "目标已达成", DEFAULT_VECTOR_FONT_FILENAME, 35);\r
+        InitLabel(labeltitle, 83, 50, 300, 35, "label1", "目标已达成", DEFAULT_VECTOR_FONT_FILENAME, 35);\r
         getView->Add(labeltitle);\r
         getView->Add(labeltag);\r
-        TraingModel::GetInstance()->InitLabel(labelgettag, 103, 307, 200, 35, "label3", "完成目标", DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        InitLabel(labelgettag, 103, 307, 200, 35, "label3", "完成目标", DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         getView->Add(labelgettag);\r
-        TraingModel::GetInstance()->InitLabel(labelpre, 233, 307, 160, 35, "label3", "100%", DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        InitLabel(labelpre, 233, 307, 160, 35, "label3", "100%", DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         getView->Add(labelpre);\r
 \r
         // 初始化按键\r
-        TraingModel::GetInstance()->InitButtonExt(buttonok_, 0, 366, 466, 100, BUTTONWINOK, STR_OK, 30);\r
+        InitButtonExt(buttonok_, 0, 366, 466, 100, BUTTONWINOK, STR_OK, 30);\r
         buttonok_->SetImageSrc(BUTTONOK_IMAGE, BUTTONOK_IMAGE);\r
         buttonok_->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingCardPresenter::GetInstance()));\r
         getView->Add(buttonok_);\r
 \r
-        InitImageAnimatorSource();\r
+        InitImageAnimator();\r
         RootView::GetInstance()->Add(getView);\r
         getView->SetDraggable(false);\r
         getView->SetTouchable(true);\r
index 233c1dc..96dd998 100644 (file)
@@ -10,6 +10,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_button.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 #include "string"
 #include <chrono>
@@ -41,30 +42,30 @@ namespace OHOS
     void TrainingControlView ::InitView()
     {
         //  初始化Button
-        TraingModel::GetInstance()->InitButton(buttonEnd, 91, 205, 110, 110, BUTTONEND);
+        InitButton(buttonEnd, 91, 205, 110, 110, BUTTONEND);
         // Set additional property
         buttonEnd->SetImageSrc(SPORT_STOP_IMAGE, SPORT_STOP_IMAGE);
         // 设置按钮的点击事件监听器为 TraingGPSPresenter 的实例
         buttonEnd->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingCardPresenter::GetInstance()));
         Add(buttonEnd);
-        TraingModel::GetInstance()->InitButton(buttonStop, 261, 205, 110, 110, BUTTONSTOP);
+        InitButton(buttonStop, 261, 205, 110, 110, BUTTONSTOP);
         // Set additional property
         buttonStop->SetImageSrc(SPORT_PAUSE_IMAGE, SPORT_PAUSE_IMAGE);
         buttonStop->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingCardPresenter::GetInstance()));
         Add(buttonStop);
 
         // 初始化Lable
-        TraingModel::GetInstance()->InitLabel(labeltitle, 83, 50, 300, 35, "label1", "训练中", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        TraingModel::GetInstance()->InitLabel(labeltimer, 78, 110, 290, 80, "label2", "00:00:00", DEFAULT_VECTOR_FONT_FILENAME, 65);
-        TraingModel::GetInstance()->InitLabel(labelend, 81, 330, 130, 35, "label3", "结束", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        TraingModel::GetInstance()->InitLabel(labelstop, 251, 330, 130, 35, "label4", "暂停", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabel(labeltitle, 83, 50, 300, 35, "label1", "训练中", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabel(labeltimer, 78, 110, 290, 80, "label2", "00:00:00", DEFAULT_VECTOR_FONT_FILENAME, 65);
+        InitLabel(labelend, 81, 330, 130, 35, "label3", "结束", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabel(labelstop, 251, 330, 130, 35, "label4", "暂停", DEFAULT_VECTOR_FONT_FILENAME, 30);
         Add(labeltitle);
         Add(labeltimer);
         Add(labelend);
         Add(labelstop);
 
         // 初始化Image
-        TraingModel::GetInstance()->InitImageView(imagepoint, 193, 421, 80, 20, "image1", CONTROL_POINT_IMAGE);
+        InitImageView(imagepoint, 193, 421, 80, 20, "image1", CONTROL_POINT_IMAGE);
         Add(imagepoint);
     }
 
index 451ced1..5f69b5c 100644 (file)
@@ -10,6 +10,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_button.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 
 namespace OHOS
@@ -39,24 +40,24 @@ namespace OHOS
     void TrainingDataView ::InitView()
     {
         // 初始化Image
-        TraingModel::GetInstance()->InitImageView(image_progress, 13, 13, 440, 386, "image1", PROGRESS_IMAGE);
-        TraingModel::GetInstance()->InitImageView(image_heart, 88, 295, 50, 50, "image2", SPORT_HEARTRATE_IMAGE);
-        TraingModel::GetInstance()->InitImageView(image_iconup, 225, 396, 16, 10, "image4", INCO_UP_IMAGE);
-        TraingModel::GetInstance()->InitImageView(image_iconpoint, 193, 421, 80, 20, "image5", DATA_POINT_IMAGE);
+        InitImageView(image_progress, 13, 13, 440, 386, "image1", PROGRESS_IMAGE);
+        InitImageView(image_heart, 88, 295, 50, 50, "image2", SPORT_HEARTRATE_IMAGE);
+        InitImageView(image_iconup, 225, 396, 16, 10, "image4", INCO_UP_IMAGE);
+        InitImageView(image_iconpoint, 193, 421, 80, 20, "image5", DATA_POINT_IMAGE);
         Add(image_progress);
         Add(image_heart);
         Add(image_iconup);
         Add(image_iconpoint);
         // 初始化Lable
         UIResourceTextId sport_id = TraingModel::GetInstance()->GetSportEvent();
-        TraingModel::GetInstance()->InitLabelExt(sportlabel, 83, 120, 300, 35, "label2", sport_id, DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(sportlabel, 83, 120, 300, 35, "label2", sport_id, DEFAULT_VECTOR_FONT_FILENAME, 30);
         sportlabel->SetTextColor(Color::Gray());
 
-        TraingModel::GetInstance()->InitLabel(curtimelabel, 155, 60, 150, 50, "label1", "23:54", DEFAULT_VECTOR_FONT_FILENAME, 40);
+        InitLabel(curtimelabel, 155, 60, 150, 50, "label1", "23:54", DEFAULT_VECTOR_FONT_FILENAME, 40);
 
-        TraingModel::GetInstance()->InitLabel(timerlabel, 40, 163, 400, 140, "label3", "00:00:00", DEFAULT_VECTOR_FONT_FILENAME, 90);
-        TraingModel::GetInstance()->InitLabel(heartlabel, 85, 284, 230, 80, "label4", "144", DEFAULT_VECTOR_FONT_FILENAME, 60);
-        TraingModel::GetInstance()->InitLabel(ubpmlabel, 218, 284, 230, 80, "label5", "bpm", DEFAULT_VECTOR_FONT_FILENAME, 60);
+        InitLabel(timerlabel, 40, 163, 400, 140, "label3", "00:00:00", DEFAULT_VECTOR_FONT_FILENAME, 90);
+        InitLabel(heartlabel, 85, 284, 230, 80, "label4", "144", DEFAULT_VECTOR_FONT_FILENAME, 60);
+        InitLabel(ubpmlabel, 218, 284, 230, 80, "label5", "bpm", DEFAULT_VECTOR_FONT_FILENAME, 60);
         ubpmlabel->SetTextColor(Color::Gray());
         Add(curtimelabel);
         Add(sportlabel);
@@ -65,7 +66,7 @@ namespace OHOS
         Add(ubpmlabel);
 #if 0
         //  初始化Button
-        TraingModel::GetInstance()->InitButton(buttonNote, 275, 350, 26, 26, BUTTONNOTE);
+        InitButton(buttonNote, 275, 350, 26, 26, BUTTONNOTE);
         // Set additional property
         buttonNote->SetImageSrc(NOTE_IMAGE, NOTE_IMAGE);
         buttonNote->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingCardPresenter::GetInstance()));
index 3a4e259..a687807 100644 (file)
@@ -10,6 +10,7 @@
 #include <ui_scroll_view.h>
 #include "components/ui_button.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 
 namespace OHOS
@@ -39,22 +40,22 @@ namespace OHOS
     {
         // 初始化Image
 
-        TraingModel::GetInstance()->InitImageView(progress_image, 0, 0, 100, 100, "image5", COLOR_PROGRESS_IMAGE);
-        TraingModel::GetInstance()->InitImageView(lineimage2_, 225, 190, 80, 1, "image", LINE_2_IMAGE);
+        InitImageView(progress_image, 0, 0, 100, 100, "image5", COLOR_PROGRESS_IMAGE);
+        InitImageView(lineimage2_, 225, 190, 80, 1, "image", LINE_2_IMAGE);
         Add(progress_image);
         Add(lineimage2_);
 
         // 初始化Lable
-        TraingModel::GetInstance()->InitLabel(u_milelabel, 16, 234, 220, 35, "label2", "距离(公里)", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        TraingModel::GetInstance()->InitLabel(u_stepslabel, 73, 362, 320, 35, "label3", "步数", DEFAULT_VECTOR_FONT_FILENAME, 30);
-        TraingModel::GetInstance()->InitLabel(u_calorielabel, 225, 235, 230, 35, "label4", "卡路里(千卡)", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabel(u_milelabel, 16, 234, 220, 35, "label2", "距离(公里)", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabel(u_stepslabel, 73, 362, 320, 35, "label3", "步数", DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabel(u_calorielabel, 225, 235, 230, 35, "label4", "卡路里(千卡)", DEFAULT_VECTOR_FONT_FILENAME, 30);
         u_milelabel->SetTextColor(Color::Gray());
         u_stepslabel->SetTextColor(Color::Gray());
         u_calorielabel->SetTextColor(Color::Gray());
 
-        TraingModel::GetInstance()->InitLabel(milelabel, 17, 170, 200, 60, "label6", "13.21", DEFAULT_VECTOR_FONT_FILENAME, 60);
-        TraingModel::GetInstance()->InitLabel(calorielabel, 230, 170, 200, 60, "label7", "28312", DEFAULT_VECTOR_FONT_FILENAME, 60);
-        TraingModel::GetInstance()->InitLabel(steplabel, 133, 296, 200, 60, "label8", "210.03", DEFAULT_VECTOR_FONT_FILENAME, 60);
+        InitLabel(milelabel, 17, 170, 200, 60, "label6", "13.21", DEFAULT_VECTOR_FONT_FILENAME, 60);
+        InitLabel(calorielabel, 230, 170, 200, 60, "label7", "28312", DEFAULT_VECTOR_FONT_FILENAME, 60);
+        InitLabel(steplabel, 133, 296, 200, 60, "label8", "210.03", DEFAULT_VECTOR_FONT_FILENAME, 60);
         Add(u_milelabel);
         Add(u_stepslabel);
         Add(u_calorielabel);
@@ -62,7 +63,7 @@ namespace OHOS
         Add(steplabel);
         Add(calorielabel);
 
-        TraingModel::GetInstance()->InitButtonExt(intensity_button, 103, 70, 260, 80, "button", STR_MEDIUM_STRENGTH, 30);
+        InitButtonExt(intensity_button, 103, 70, 260, 80, "button", STR_MEDIUM_STRENGTH, 30);
         Add(intensity_button);
 
         SetTouchable(true);
index 4adba24..d4cd21c 100644 (file)
@@ -13,6 +13,7 @@
 #include "MainPresenterSample.h"\r
 #include "traing/training_card/include/Training_CardPresenter.h"\r
 #include "traing/include/TraingModel.h"\r
+#include "uicomponents/UIComponents.h"\r
 #include "traing/Training_UiConfig.h"\r
 \r
 namespace OHOS\r
@@ -41,7 +42,7 @@ namespace OHOS
     bool Training_CardView::InitLable()\r
     {\r
         //  初始化标签\r
-        TraingModel::GetInstance()->InitLabelExt(titleLabel, 130, 52, 200, 60, "title_label", STR_RAPID_TRAINING, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        InitLabelExt(titleLabel, 130, 52, 200, 60, "title_label", STR_RAPID_TRAINING, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         Add(titleLabel);\r
         return true;\r
     }\r
index ec09622..c0f9c07 100644 (file)
@@ -10,6 +10,7 @@
 
 #include "traing/training_list_aquatic/include/TraingAquaticItemView.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 #include "components/ui_label_ext.h"
 #include "language/font/ui_resource_string.h"
index 6540e53..5328b8a 100644 (file)
@@ -35,6 +35,7 @@
 #include "traing/training_list_aquatic/include/TraingAquaticPresenter.h"
 #include "traing/training_list_aquatic/include/TraingAquaticView.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 // #include "TraingAquaticView.h"
 
 namespace OHOS
index e3f8013..3ec7102 100644 (file)
@@ -1,6 +1,7 @@
 #include "traing/training_list_aquatic/include/TraingAquaticView.h"
 #include "traing/training_list_aquatic/include/TraingAquaticPresenter.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 
 #include "components/ui_label_ext.h"
@@ -61,7 +62,7 @@ namespace OHOS
 
         /* -------------------------------------------------------------------------- */
         // 初始化Lable
-        TraingModel::GetInstance()->InitLabelExt(title, 135, 52, 200, 60, "label1", STR_WATER_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(title, 135, 52, 200, 60, "label1", STR_WATER_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30);
         title->SetStyle(STYLE_TEXT_COLOR, Color::Green().full);
         scrollView->Add(title);
         // UIList 的适配器
index 5c64a9a..4d84af3 100644 (file)
@@ -2,6 +2,7 @@
 
 #include "traing/training_list_ball/include/TraingBallItemView.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 #include "components/ui_label_ext.h"
 #include "language/font/ui_resource_string.h"
index 89e5a6d..2a5ee01 100644 (file)
@@ -12,6 +12,7 @@
 #include "traing/training_list_ball/include/TraingBallPresenter.h"
 #include "traing/training_list_ball/include/TraingBallView.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 // #include "TraingBallView.h"
 
 namespace OHOS
index 0597be5..d4726a3 100644 (file)
@@ -1,6 +1,7 @@
 #include "traing/training_list_ball/include/TraingBallView.h"
 #include "traing/training_list_ball/include/TraingBallPresenter.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 
 #include "components/ui_label_ext.h"
@@ -61,7 +62,7 @@ namespace OHOS
 
         /* -------------------------------------------------------------------------- */
         // 初始化Lable
-        TraingModel::GetInstance()->InitLabelExt(title, 135, 52, 200, 60, "label1", STR_BALL_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(title, 135, 52, 200, 60, "label1", STR_BALL_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30);
         title->SetStyle(STYLE_TEXT_COLOR, Color::Green().full);
         scrollView->Add(title);
         // UIList 的适配器
index 5755fa3..c96950a 100644 (file)
@@ -9,6 +9,7 @@
 
 #include "traing/training_list_dance/include/TraingDanceItemView.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 #include "components/ui_label_ext.h"
 #include "language/font/ui_resource_string.h"
index dd6fb77..bab145e 100644 (file)
@@ -12,6 +12,7 @@
 #include "traing/training_list_dance/include/TraingDancePresenter.h"
 #include "traing/training_list_dance/include/TraingDanceView.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 
 namespace OHOS
 {
index fe02e9d..b40d502 100644 (file)
@@ -1,6 +1,7 @@
 #include "traing/training_list_dance/include/TraingDanceView.h"
 #include "traing/training_list_dance/include/TraingDancePresenter.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 
 #include "components/ui_label_ext.h"
@@ -61,7 +62,7 @@ namespace OHOS
 
         /* -------------------------------------------------------------------------- */
         // 初始化Lable
-        TraingModel::GetInstance()->InitLabelExt(title, 135, 52, 200, 60, "label1", STR_DANCING_TITLE, DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(title, 135, 52, 200, 60, "label1", STR_DANCING_TITLE, DEFAULT_VECTOR_FONT_FILENAME, 30);
         title->SetStyle(STYLE_TEXT_COLOR, Color::Green().full);
         scrollView->Add(title);
         // UIList 的适配器
index 3e12df8..1e51f95 100644 (file)
@@ -1,6 +1,7 @@
 
 #include "traing/training_list_fitness/include/TraingFitnessItemView.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 #include "UiConfig.h"
 namespace OHOS
index c6a2635..a68645f 100644 (file)
@@ -26,6 +26,7 @@
 #include "traing/training_list_fitness/include/TraingFitnessView.h"
 // #include "TraingFitnessView.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 namespace OHOS
 {
     extern const char *Fitness_buttons[];
index ce274fc..edd4239 100644 (file)
@@ -1,6 +1,7 @@
 #include "traing/training_list_fitness/include/TraingFitnessView.h"
 #include "traing/training_list_fitness/include/TraingFitnessPresenter.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 
 #include "UiConfig.h"
@@ -59,7 +60,7 @@ namespace OHOS
 
         /* -------------------------------------------------------------------------- */
         // 初始化Lable
-        TraingModel::GetInstance()->InitLabelExt(title, 135, 52, 200, 60, "label1", STR_EXERCISE_TITLE, DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(title, 135, 52, 200, 60, "label1", STR_EXERCISE_TITLE, DEFAULT_VECTOR_FONT_FILENAME, 30);
         title->SetStyle(STYLE_TEXT_COLOR, Color::Green().full);
         scrollView->Add(title);
         // UIList 的适配器
index 05c6b3b..d7aa3fb 100644 (file)
@@ -9,6 +9,7 @@
 
 #include "traing/training_list_ice/include/TraingIceItemView.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 #include "components/ui_label_ext.h"
 #include "language/font/ui_resource_string.h"
index ef73cf0..a57dbd4 100644 (file)
@@ -12,6 +12,7 @@
 #include "traing/training_list_ice/include/TraingIcePresenter.h"
 #include "traing/training_list_ice/include/TraingIceView.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 
 namespace OHOS
 {
index 47bf3f1..4182d1b 100644 (file)
@@ -9,6 +9,7 @@
 #include "traing/training_list_ice/include/TraingIceView.h"
 #include "traing/training_list_ice/include/TraingIcePresenter.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 
 #include "components/ui_label_ext.h"
@@ -69,7 +70,7 @@ namespace OHOS
 
         /* -------------------------------------------------------------------------- */
         // 初始化Lable
-        TraingModel::GetInstance()->InitLabelExt(title, 135, 52, 200, 60, "label1", STR_ICE_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(title, 135, 52, 200, 60, "label1", STR_ICE_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30);
         title->SetStyle(STYLE_TEXT_COLOR, Color::Green().full);
         scrollView->Add(title);
         // UIList 的适配器
index cc65322..1c775cb 100644 (file)
@@ -9,6 +9,7 @@
 
 #include "traing/training_list_limit/include/TraingLimitItemView.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 #include "components/ui_label_ext.h"
 #include "language/font/ui_resource_string.h"
index e67e22e..e4963ed 100644 (file)
@@ -11,6 +11,7 @@
 #include "traing/training_list_limit/include/TraingLimitPresenter.h"\r
 #include "traing/training_list_limit/include/TraingLimitView.h"\r
 #include "traing/include/TraingModel.h"\r
+#include "uicomponents/UIComponents.h"\r
 // #include "TraingLimitView.h"\r
 \r
 namespace OHOS\r
index 1be5906..e8de6c7 100644 (file)
@@ -1,6 +1,7 @@
 #include "traing/training_list_limit/include/TraingLimitView.h"\r
 #include "traing/training_list_limit/include/TraingLimitPresenter.h"\r
 #include "traing/include/TraingModel.h"\r
+#include "uicomponents/UIComponents.h"\r
 #include "traing/Training_UiConfig.h"\r
 \r
 #include "components/ui_label_ext.h"\r
@@ -61,7 +62,7 @@ namespace OHOS
 \r
         /* -------------------------------------------------------------------------- */\r
         // 初始化Lable\r
-        TraingModel::GetInstance()->InitLabelExt(title, 135, 52, 200, 60, "label1", STR_EXTREME_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        InitLabelExt(title, 135, 52, 200, 60, "label1", STR_EXTREME_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         title->SetStyle(STYLE_TEXT_COLOR, Color::Green().full);\r
         scrollView->Add(title);\r
         // UIList 的适配器\r
index 38270f2..e0513ed 100644 (file)
@@ -9,6 +9,7 @@
 
 #include "traing/training_list_more/include/TraingMoreItemView.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 #include "components/ui_label_ext.h"
 #include "language/font/ui_resource_string.h"
index a481f32..420166a 100644 (file)
@@ -12,6 +12,7 @@
 #include "traing/training_list_more/include/TraingMorePresenter.h"\r
 #include "traing/training_list_more/include/TraingMoreView.h"\r
 #include "traing/include/TraingModel.h"\r
+#include "uicomponents/UIComponents.h"\r
 // #include "TraingMoreView.h"\r
 \r
 namespace OHOS\r
index fc88479..dec193d 100644 (file)
@@ -9,6 +9,7 @@
 #include "traing/training_list_more/include/TraingMoreView.h"\r
 #include "traing/training_list_more/include/TraingMorePresenter.h"\r
 #include "traing/include/TraingModel.h"\r
+#include "uicomponents/UIComponents.h"\r
 #include "traing/Training_UiConfig.h"\r
 \r
 #include "components/ui_label_ext.h"\r
@@ -66,7 +67,7 @@ namespace OHOS
 \r
         /* -------------------------------------------------------------------------- */\r
         // 初始化Lable\r
-        TraingModel::GetInstance()->InitLabelExt(title, 125, 52, 200, 60, "label1", STR_TRAINING, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        InitLabelExt(title, 125, 52, 200, 60, "label1", STR_TRAINING, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         scrollView->Add(title);\r
         // UIList 的适配器\r
         p_TraingMoreListAdapter = new TraingMoreAdapter();\r
index 2edca4b..22a20d6 100644 (file)
@@ -10,6 +10,7 @@
 
 #include "traing/training_list_other/include/TraingOtherItemView.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 #include "components/ui_label_ext.h"
 #include "language/font/ui_resource_string.h"
index 68da86f..6d2c9c6 100644 (file)
@@ -27,6 +27,7 @@
 #include "traing/training_list_other/include/TraingOtherPresenter.h"
 #include "traing/training_list_other/include/TraingOtherView.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 // #include "TraingOtherView.h"
 
 namespace OHOS
index 1d85526..34c0b85 100644 (file)
@@ -1,6 +1,7 @@
 #include "traing/training_list_other/include/TraingOtherView.h"
 #include "traing/training_list_other/include/TraingOtherPresenter.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 
 #include "components/ui_label_ext.h"
@@ -61,7 +62,7 @@ namespace OHOS
 
         /* -------------------------------------------------------------------------- */
         // 初始化Lable
-        TraingModel::GetInstance()->InitLabelExt(title, 125, 52, 200, 60, "label1", STR_OTHER_TITLE, DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(title, 125, 52, 200, 60, "label1", STR_OTHER_TITLE, DEFAULT_VECTOR_FONT_FILENAME, 30);
         title->SetStyle(STYLE_TEXT_COLOR, Color::Green().full);
         scrollView->Add(title);
         // UIList 的适配器
index 7b8efd3..6428fe8 100644 (file)
@@ -17,6 +17,7 @@
 
 #include "traing/training_list_rest/include/TraingRestItemView.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 #include "components/ui_label_ext.h"
 #include "language/font/ui_resource_string.h"
index b55faab..17bae9c 100644 (file)
@@ -11,6 +11,7 @@
 #include "traing/training_list_rest/include/TraingRestPresenter.h"
 #include "traing/training_list_rest/include/TraingRestView.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 // #include "TraingRestView.h"
 
 namespace OHOS
index 7fdc257..5e0d517 100644 (file)
@@ -1,6 +1,7 @@
 #include "traing/training_list_rest/include/TraingRestView.h"
 #include "traing/training_list_rest/include/TraingRestPresenter.h"
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 
 #include "components/ui_label_ext.h"
@@ -61,7 +62,7 @@ namespace OHOS
 
         /* -------------------------------------------------------------------------- */
         // 初始化Lable
-        TraingModel::GetInstance()->InitLabelExt(title, 125, 52, 200, 60, "label1", STR_RECREATIONAL_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30);
+        InitLabelExt(title, 125, 52, 200, 60, "label1", STR_RECREATIONAL_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30);
         title->SetStyle(STYLE_TEXT_COLOR, Color::Green().full);
         scrollView->Add(title);
         // UIList 的适配器
index c4e4d0b..41600ba 100644 (file)
@@ -19,6 +19,7 @@
 #include "components/ui_card_page.h"
 
 #include "traing/include/TraingModel.h"
+#include "uicomponents/UIComponents.h"
 #include "traing/Training_UiConfig.h"
 #include "TraingRecordPresenter.h"
 namespace OHOS