From: Caisking <3449750381@qq.com> Date: Thu, 25 Apr 2024 02:56:45 +0000 (+0800) Subject: 修改训练UI初始化接口 X-Git-Tag: release_V1.2.70_20241020_135402~1132 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=24a2afb4e8fce1e850fc3a9a74426f2b51e1d0cb;p=mirrors%2FFD230.git 修改训练UI初始化接口 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEnddataView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEnddataView.h index 9051d072d..b141b59da 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEnddataView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEnddataView.h @@ -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 @@ -23,10 +29,9 @@ #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 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h index 1daf04cd1..4eefcfb95 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h @@ -13,20 +13,8 @@ #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(); /*设置运动类型*/ diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalView.h index ae995acea..5c7c58c18 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalView.h @@ -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" 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 8afcd2de7..07dfc6ad9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetView.h @@ -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" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingView.h index 602992688..6b7dac677 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingView.h @@ -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 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetCaluliView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetCaluliView.h index 397590447..5edd7eeba 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetCaluliView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetCaluliView.h @@ -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" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetMileView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetMileView.h index 719ca3e89..412bdd468 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetMileView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetMileView.h @@ -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" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetStepView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetStepView.h index 1354f4221..66862e0ee 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetStepView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetStepView.h @@ -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" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetTimeView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetTimeView.h index 271c29948..27a3b6a0c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetTimeView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TrainingSetTimeView.h @@ -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" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp index 8f41f5258..a0e1a30fe 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp @@ -9,6 +9,7 @@ #include #include "components/ui_button.h" #include "traing/include/TraingModel.h" +#include "uicomponents/UIComponents.h" #include "traing/Training_UiConfig.h" #include // 包含数学函数库，用于四舍五入 #include // 包含字符串处理库，用于使用 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(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()); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp index 4f0d9f6f5..342e56364 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp @@ -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 #include @@ -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; diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp index 037a7783e..2adc8a910 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp @@ -9,6 +9,7 @@ #include #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); // 设置按下时的透明度为半透明 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp index f936c450a..e318c4378 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp @@ -15,6 +15,7 @@ #include #include "traing/include/TraingPresenter.h" #include "traing/include/TraingModel.h" +#include "uicomponents/UIComponents.h" // #include "TraingView.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp index 1730462a6..054c1048f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp @@ -15,6 +15,7 @@ #include "traing/include/TraingSetPresenter.h" #include "traing/training_card/include/TraingCardPresenter.h" #include "traing/include/TraingModel.h" +#include "uicomponents/UIComponents.h" // #include "TraingSetView.h" #define TAGTEST 0 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 e43bca53a..396ca94ad 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp @@ -9,6 +9,7 @@ #include #include "components/ui_button.h" #include "traing/include/TraingModel.h" +#include "uicomponents/UIComponents.h" #include "traing/Training_UiConfig.h" namespace OHOS @@ -43,13 +44,13 @@ namespace OHOS 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); + InitButton(butTime, 43, 120, 380, 100, BUTTONTIME); + InitButton(butKcal, 43, 240, 380, 100, BUTTONCALULI); butTime->SetOnClickListener(static_cast(TraingSetPresenter::GetInstance())); butKcal->SetOnClickListener(static_cast(TraingSetPresenter::GetInstance())); - TraingModel::GetInstance()->InitButton(butDistance, 43, 360, 380, 100, BUTTONDISTANCE); - TraingModel::GetInstance()->InitButton(butSteps, 43, 480, 380, 100, BUTTONSTEPS); + InitButton(butDistance, 43, 360, 380, 100, BUTTONDISTANCE); + InitButton(butSteps, 43, 480, 380, 100, BUTTONSTEPS); butDistance->SetOnClickListener(static_cast(TraingSetPresenter::GetInstance())); butSteps->SetOnClickListener(static_cast(TraingSetPresenter::GetInstance())); @@ -59,11 +60,11 @@ namespace OHOS 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(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); + InitLabelExt(labeltitle, 83, 50, 300, 35, "label1", sportid, DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabel(labelTime, 100, 150, 150, 35, "label2", "时长", DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabel(labelKcal, 100, 270, 150, 35, "label4", "卡路里", DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabel(labelDistance, 100, 390, 150, 35, "label3", "距离", DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabel(labelSteps, 100, 510, 150, 35, "label5", "步数", DEFAULT_VECTOR_FONT_FILENAME, 30); SetTagScrollView[SET_VIEW]->Add(labeltitle); SetTagScrollView[SET_VIEW]->Add(labelTime); @@ -72,15 +73,15 @@ namespace OHOS 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); + InitImageView(imagetime, 70, 150, 100, 100, "image1", TIME_IMAGE); + InitImageView(imagcal, 70, 270, 100, 100, "image2", CALORIES_IMAGE); + InitImageView(imagedistance, 70, 390, 100, 100, "image5", MILEAGE_IMAGE); + InitImageView(imagesteps, 70, 510, 100, 100, "image6", WALKING_IMAGE); - TraingModel::GetInstance()->InitImageView(imagicon1, 380, 160, 100, 100, "image3", 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); + InitImageView(imagicon1, 380, 160, 100, 100, "image3", ICON_IMAGE); + InitImageView(imagicon2, 380, 280, 100, 100, "image4", ICON_IMAGE); + InitImageView(imagicon3, 380, 400, 100, 100, "image3", ICON_IMAGE); + InitImageView(imagicon4, 380, 520, 100, 100, "image4", ICON_IMAGE); SetTagScrollView[SET_VIEW]->Add(imagetime); SetTagScrollView[SET_VIEW]->Add(imagcal); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp index 747ca81da..7f93aa51d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp @@ -71,33 +71,33 @@ namespace OHOS { // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingModel::AddLabel"); // 初始化标签 - 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); + 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); - 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); - 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); - 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); - 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); + 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); + 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); + 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); + 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); return true; } bool TraingView::AddButton() { - TraingModel::GetInstance()->InitButton(button1_, BUTTON1_X, BUTTON1_Y, BUTTON_WIDHT, BUTTON_HEIGHT, BUTTON1); + InitButton(button1_, BUTTON1_X, BUTTON1_Y, BUTTON_WIDHT, BUTTON_HEIGHT, BUTTON1); button1_->SetImageSrc(BUTTONGROUND2_IMAGE, BUTTONGROUND2_IMAGE); UIView::OnClickListener *button1Click = static_cast(TraingPresenter::GetInstance()); button1_->SetOnClickListener(button1Click); - TraingModel::GetInstance()->InitButton(button2_, BUTTON2_X, BUTTON2_Y, BUTTON_WIDHT, BUTTON_HEIGHT, BUTTON2); + InitButton(button2_, BUTTON2_X, BUTTON2_Y, BUTTON_WIDHT, BUTTON_HEIGHT, BUTTON2); button2_->SetImageSrc(BOUTTONGROUND_IMAGE, BOUTTONGROUND_IMAGE); UIView::OnClickListener *button2Click = static_cast(TraingPresenter::GetInstance()); button2_->SetOnClickListener(button2Click); - TraingModel::GetInstance()->InitButton(button3_, BUTTON3_X, BUTTON3_Y, BUTTON_WIDHT, BUTTON_HEIGHT, BUTTON3); + InitButton(button3_, BUTTON3_X, BUTTON3_Y, BUTTON_WIDHT, BUTTON_HEIGHT, BUTTON3); button3_->SetImageSrc(BOUTTONGROUND_IMAGE, BOUTTONGROUND_IMAGE); UIView::OnClickListener *button3Click = static_cast(TraingPresenter::GetInstance()); button3_->SetOnClickListener(button3Click); - TraingModel::GetInstance()->InitButton(buttonmore_, BUTTONMORE_X, BUTTONMORE_Y, BUTTON_WIDHT, BUTTON_HEIGHT, BUTTONMORE); + InitButton(buttonmore_, BUTTONMORE_X, BUTTONMORE_Y, BUTTON_WIDHT, BUTTON_HEIGHT, BUTTONMORE); buttonmore_->SetImageSrc(BUTTONGROUND2_IMAGE, BUTTONGROUND2_IMAGE); UIView::OnClickListener *button4Click = static_cast(TraingPresenter::GetInstance()); buttonmore_->SetOnClickListener(button4Click); @@ -112,10 +112,10 @@ namespace OHOS bool TraingView::AddImageView() { - TraingModel::GetInstance()->InitImageView(btn1_image, BTN1_IMAGE_X, BTN1_IMAGE_Y, BTN_IMAGE_SIZE, BTN_IMAGE_SIZE, "btn1_image", WALKING_60_IMAGE); - TraingModel::GetInstance()->InitImageView(btn2_image, BTN2_IMAGE_X, BTN2_IMAGE_Y, BTN_IMAGE_SIZE, BTN_IMAGE_SIZE, "btn2_image", RIDING_60_IMAGE); - TraingModel::GetInstance()->InitImageView(btn3_image, BTN3_IMAGE_X, BTN3_IMAGE_Y, BTN_IMAGE_SIZE, BTN_IMAGE_SIZE, "btn3_image", RUNNING_60_IMAGE); - TraingModel::GetInstance()->InitImageView(btnmore_image, BTNMORE_IMAGE_X, BTNMORE_IMAGE_Y, BTN_IMAGE_SIZE, BTN_IMAGE_SIZE, "btnmore_image", MORE_ICON_IMAGE); + InitImageView(btn1_image, BTN1_IMAGE_X, BTN1_IMAGE_Y, BTN_IMAGE_SIZE, BTN_IMAGE_SIZE, "btn1_image", WALKING_60_IMAGE); + InitImageView(btn2_image, BTN2_IMAGE_X, BTN2_IMAGE_Y, BTN_IMAGE_SIZE, BTN_IMAGE_SIZE, "btn2_image", RIDING_60_IMAGE); + InitImageView(btn3_image, BTN3_IMAGE_X, BTN3_IMAGE_Y, BTN_IMAGE_SIZE, BTN_IMAGE_SIZE, "btn3_image", RUNNING_60_IMAGE); + InitImageView(btnmore_image, BTNMORE_IMAGE_X, BTNMORE_IMAGE_Y, BTN_IMAGE_SIZE, BTN_IMAGE_SIZE, "btnmore_image", MORE_ICON_IMAGE); return true; } void TraingView::InitView() diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetCaluliView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetCaluliView.cpp index fe01c91b4..0797a6529 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetCaluliView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetCaluliView.cpp @@ -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 #include #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(TraingSetPresenter::GetInstance())); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetMileView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetMileView.cpp index 9e5f239f1..63d65fe9f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetMileView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetMileView.cpp @@ -18,6 +18,7 @@ #include #include #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(TraingSetPresenter::GetInstance())); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetStepView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetStepView.cpp index 92e6decb2..cdffebd50 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetStepView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetStepView.cpp @@ -18,6 +18,7 @@ #include #include #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(TraingSetPresenter::GetInstance())); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetTimeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetTimeView.cpp index d6914fdfd..188fe3b13 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetTimeView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TrainingSetTimeView.cpp @@ -18,6 +18,7 @@ #include #include #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(TraingSetPresenter::GetInstance())); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSView.h index 234fcd1c0..9fdcb5fd3 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSView.h @@ -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" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSbackView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSbackView.h index 060abba1a..f8351abce 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSbackView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSbackView.h @@ -19,9 +19,11 @@ #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 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSlackView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSlackView.h index bd4145030..dd8cfd3d1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSlackView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSlackView.h @@ -18,8 +18,10 @@ #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" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSlostView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSlostView.h index 363b696ca..74329b3fe 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSlostView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSlostView.h @@ -18,9 +18,11 @@ #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 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSnoteView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSnoteView.h index 333aa0ba4..eb282d748 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSnoteView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSnoteView.h @@ -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" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSsetView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSsetView.h index e0f752d69..30c403e26 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSsetView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/include/TraingGPSsetView.h @@ -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" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSView.cpp index b769a1d79..ba0830268 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSView.cpp @@ -9,6 +9,7 @@ #include #include "components/ui_button.h" #include "traing/include/TraingModel.h" +#include "uicomponents/UIComponents.h" #include "traing/Training_UiConfig.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackView.cpp index 4988f2723..0a9d123c1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackView.cpp @@ -9,6 +9,7 @@ #include #include "components/ui_button.h" #include "traing/include/TraingModel.h" +#include "uicomponents/UIComponents.h" #include "traing/Training_UiConfig.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlackView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlackView.cpp index a0a2fb33c..63f9e9363 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlackView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlackView.cpp @@ -9,6 +9,7 @@ #include #include "components/ui_button.h" #include "traing/include/TraingModel.h" +#include "uicomponents/UIComponents.h" #include "traing/Training_UiConfig.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlostView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlostView.cpp index 8839621d7..8ff2a11f7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlostView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlostView.cpp @@ -9,6 +9,7 @@ #include #include "components/ui_button.h" #include "traing/include/TraingModel.h" +#include "uicomponents/UIComponents.h" #include "traing/Training_UiConfig.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSnoteView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSnoteView.cpp index 6d1206458..d42dd9302 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSnoteView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSnoteView.cpp @@ -9,6 +9,7 @@ #include #include "components/ui_button.h" #include "traing/include/TraingModel.h" +#include "uicomponents/UIComponents.h" #include "traing/Training_UiConfig.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSsetView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSsetView.cpp index 851942c85..62f618270 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSsetView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSsetView.cpp @@ -9,6 +9,7 @@ #include #include "components/ui_button.h" #include "traing/include/TraingModel.h" +#include "uicomponents/UIComponents.h" #include "traing/Training_UiConfig.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardPresenter.h index cc08ec6a2..3c5f8f4bd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardPresenter.h @@ -20,6 +20,7 @@ #include "cywee_service.h" #include "cywee_hal.h" #include "traing/include/TraingModel.h" +#include "uicomponents/UIComponents.h" #include "bletest.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h index 1193902d2..c8a69b241 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h @@ -1,7 +1,7 @@ /*** * @Date: 2024-04-15 11:46:23 * @LastEditors: Caisking 3449750381@qq.com - * @LastEditTime: 2024-04-23 11:00:11 + * @LastEditTime: 2024-04-25 10:52:21 * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TraingCardView.h */ #ifndef _TraingCard_VIEW_H @@ -24,11 +24,13 @@ #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 "components/ui_swipe_view.h" #include "components/ui_cross_view.h" #include "traing/include/TraingModel.h" +#include "uicomponents/UIComponents.h" #include "traing/Training_UiConfig.h" #include "traing/training_card/include/TraingCardPresenter.h" @@ -83,7 +85,7 @@ namespace OHOS void InitList(); void PreLoad(void); - void InitImageAnimatorSource(); + void InitImageAnimator(); void ShowGetTagView(); void ShowEndView(); bool RefreshEndView(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TrainingDataView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TrainingDataView.h index b12fbabde..9265a1eca 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TrainingDataView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TrainingDataView.h @@ -18,9 +18,11 @@ #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" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TrainingDetailView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TrainingDetailView.h index e961bbe0b..84566bf99 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TrainingDetailView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/TrainingDetailView.h @@ -24,9 +24,11 @@ #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" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp index 8c33cd21c..d85f1d2d9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp @@ -11,6 +11,7 @@ #include "traing/training_card/include/TraingCardPresenter.h" #include "traing/training_card/include/TrainingControlView.h" #include "traing/include/TraingModel.h" +#include "uicomponents/UIComponents.h" #include "custom_utils.h" #include "vibrator_service.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp index acc1ec236..be920a3b5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp @@ -15,6 +15,7 @@ #include "font/ui_font.h" #include "traing/include/TraingModel.h" +#include "uicomponents/UIComponents.h" #include "custom_utils.h" extern "C" @@ -286,16 +287,16 @@ namespace OHOS endView->SetReboundSize(50); endView->SetDirection(1); - TraingModel::GetInstance()->InitLabel(endtitle, 83, 50, 300, 35, "label1", "注意", DEFAULT_VECTOR_FONT_FILENAME, 30); - TraingModel::GetInstance()->InitLabel(notelabel, 56, 167, 360, 80, "label2", "当前运动量过少，无法记录 是否结束运动", DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabel(endtitle, 83, 50, 300, 35, "label1", "注意", DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabel(notelabel, 56, 167, 360, 80, "label2", "当前运动量过少，无法记录 是否结束运动", DEFAULT_VECTOR_FONT_FILENAME, 30); endView->Add(endtitle); endView->Add(notelabel); - TraingModel::GetInstance()->InitButton(exit, 111, 299, 100, 100, BUTTONBACK); + InitButton(exit, 111, 299, 100, 100, BUTTONBACK); exit->SetOnClickListener(static_cast(TraingCardPresenter::GetInstance())); exit->SetImageSrc(NO_IMAGE, NO_IMAGE); - TraingModel::GetInstance()->InitButton(back, 256, 299, 100, 100, BUTTONEXIT); + InitButton(back, 256, 299, 100, 100, BUTTONEXIT); back->SetOnClickListener(static_cast(TraingCardPresenter::GetInstance())); back->SetImageSrc(YES_IMAGE, YES_IMAGE); endView->Add(exit); @@ -355,7 +356,7 @@ namespace OHOS } /*初始化动画以及Taglabel*/ - void TraingCardView::InitImageAnimatorSource() + void TraingCardView::InitImageAnimator() { int tag = TraingModel::GetInstance()->GetSportTag(); ExerciseTag tagType = TraingModel::GetInstance()->GetSportTagtype(); @@ -390,15 +391,15 @@ namespace OHOS break; } PRINT("tag[%d]-tagType[%d]-tagString[%s]\r\n", tag, tagType, tagString.c_str()); - TraingModel::GetInstance()->InitLabel(labeltag, 70, 215, 326, 97, "label2", tagString.c_str(), DEFAULT_VECTOR_FONT_FILENAME, 80); + InitLabel(labeltag, 70, 215, 326, 97, "label2", tagString.c_str(), DEFAULT_VECTOR_FONT_FILENAME, 80); labeltag->SetTextColor(Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff)); getView->Add(labeltag); // 初始化图片数组以及动画 const char *basePath = "/user/res/Training/training_GIF/win/"; const char *fileExtension = "bin"; - const char **imagePaths = TraingModel::GetInstance()->CreateImagePathsArray(basePath, fileExtension, 94); - TraingModel::GetInstance()->InitImageAnimatorSource(imageAnimator, imagePaths, 94, 173, 100, 120, 120, "imageAnimator1", 10); + const char **imagePaths = CreateImagePathsArray(basePath, fileExtension, 94); + InitImageAnimatorSource(imageAnimator, imagePaths, 94, 173, 100, 120, 120, "imageAnimator1", 10); getView->Add(imageAnimator); } @@ -418,21 +419,21 @@ namespace OHOS getView->SetDirection(1); // 初始化Lable - TraingModel::GetInstance()->InitLabel(labeltitle, 83, 50, 300, 35, "label1", "目标已达成", DEFAULT_VECTOR_FONT_FILENAME, 35); + InitLabel(labeltitle, 83, 50, 300, 35, "label1", "目标已达成", DEFAULT_VECTOR_FONT_FILENAME, 35); getView->Add(labeltitle); getView->Add(labeltag); - TraingModel::GetInstance()->InitLabel(labelgettag, 103, 307, 200, 35, "label3", "完成目标", DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabel(labelgettag, 103, 307, 200, 35, "label3", "完成目标", DEFAULT_VECTOR_FONT_FILENAME, 30); getView->Add(labelgettag); - TraingModel::GetInstance()->InitLabel(labelpre, 233, 307, 160, 35, "label3", "100%", DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabel(labelpre, 233, 307, 160, 35, "label3", "100%", DEFAULT_VECTOR_FONT_FILENAME, 30); getView->Add(labelpre); // 初始化按键 - TraingModel::GetInstance()->InitButtonExt(buttonok_, 0, 366, 466, 100, BUTTONWINOK, STR_OK, 30); + InitButtonExt(buttonok_, 0, 366, 466, 100, BUTTONWINOK, STR_OK, 30); buttonok_->SetImageSrc(BUTTONOK_IMAGE, BUTTONOK_IMAGE); buttonok_->SetOnClickListener(static_cast(TraingCardPresenter::GetInstance())); getView->Add(buttonok_); - InitImageAnimatorSource(); + InitImageAnimator(); RootView::GetInstance()->Add(getView); getView->SetDraggable(false); getView->SetTouchable(true); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp index 233c1dcec..96dd998a3 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingControlView.cpp @@ -10,6 +10,7 @@ #include #include "components/ui_button.h" #include "traing/include/TraingModel.h" +#include "uicomponents/UIComponents.h" #include "traing/Training_UiConfig.h" #include "string" #include @@ -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(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(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); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp index 451ced152..5f69b5cbf 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp @@ -10,6 +10,7 @@ #include #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(TraingCardPresenter::GetInstance())); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDetailView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDetailView.cpp index 3a4e259b2..a68780771 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDetailView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDetailView.cpp @@ -10,6 +10,7 @@ #include #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); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp index d3afb26b8..842f0e6db 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp @@ -17,6 +17,7 @@ #include "UiConfig.h" #include "wearable_log.h" #include "traing/include/TraingModel.h" +#include "uicomponents/UIComponents.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp index 4adba249f..d4cd21c29 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp @@ -13,6 +13,7 @@ #include "MainPresenterSample.h" #include "traing/training_card/include/Training_CardPresenter.h" #include "traing/include/TraingModel.h" +#include "uicomponents/UIComponents.h" #include "traing/Training_UiConfig.h" namespace OHOS @@ -41,7 +42,7 @@ namespace OHOS bool Training_CardView::InitLable() { // 初始化标签 - TraingModel::GetInstance()->InitLabelExt(titleLabel, 130, 52, 200, 60, "title_label", STR_RAPID_TRAINING, DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(titleLabel, 130, 52, 200, 60, "title_label", STR_RAPID_TRAINING, DEFAULT_VECTOR_FONT_FILENAME, 30); Add(titleLabel); return true; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticItemView.cpp index ec09622c8..c0f9c078f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticItemView.cpp @@ -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" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticPresenter.cpp index 6540e53b7..5328b8a25 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticPresenter.cpp @@ -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 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticView.cpp index e3f801378..3ec710233 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticView.cpp @@ -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 的适配器 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallItemView.cpp index 5c64a9a04..4d84af3e3 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallItemView.cpp @@ -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" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallPresenter.cpp index 89e5a6d42..2a5ee01b3 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallPresenter.cpp @@ -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 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallView.cpp index 0597be5c1..d4726a305 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallView.cpp @@ -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 的适配器 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceItemView.cpp index 5755fa3da..c96950a52 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceItemView.cpp @@ -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" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp index dd6fb77eb..bab145e5f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp @@ -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 { diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceView.cpp index fe02e9dfc..b40d50250 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceView.cpp @@ -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 的适配器 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessItemView.cpp index 3e12df8ec..1e51f9530 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessItemView.cpp @@ -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 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessPresenter.cpp index c6a263514..a68645fd7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessPresenter.cpp @@ -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[]; diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessView.cpp index ce274fc31..edd4239a5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessView.cpp @@ -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 的适配器 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceItemView.cpp index 05c6b3ba9..d7aa3fbd0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceItemView.cpp @@ -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" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp index ef73cf0aa..a57dbd447 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp @@ -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 { diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceView.cpp index 47bf3f18d..4182d1b8d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceView.cpp @@ -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 的适配器 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp index cc6532249..1c775cbe7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp @@ -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" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp index e67e22e6f..e4963ed5d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp @@ -11,6 +11,7 @@ #include "traing/training_list_limit/include/TraingLimitPresenter.h" #include "traing/training_list_limit/include/TraingLimitView.h" #include "traing/include/TraingModel.h" +#include "uicomponents/UIComponents.h" // #include "TraingLimitView.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitView.cpp index 1be590650..e8de6c738 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitView.cpp @@ -1,6 +1,7 @@ #include "traing/training_list_limit/include/TraingLimitView.h" #include "traing/training_list_limit/include/TraingLimitPresenter.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_EXTREME_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(title, 135, 52, 200, 60, "label1", STR_EXTREME_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30); title->SetStyle(STYLE_TEXT_COLOR, Color::Green().full); scrollView->Add(title); // UIList 的适配器 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreItemView.cpp index 38270f2e8..e0513ede1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreItemView.cpp @@ -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" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp index a481f32dc..420166a7b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp @@ -12,6 +12,7 @@ #include "traing/training_list_more/include/TraingMorePresenter.h" #include "traing/training_list_more/include/TraingMoreView.h" #include "traing/include/TraingModel.h" +#include "uicomponents/UIComponents.h" // #include "TraingMoreView.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp index fc884799b..dec193d5a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp @@ -9,6 +9,7 @@ #include "traing/training_list_more/include/TraingMoreView.h" #include "traing/training_list_more/include/TraingMorePresenter.h" #include "traing/include/TraingModel.h" +#include "uicomponents/UIComponents.h" #include "traing/Training_UiConfig.h" #include "components/ui_label_ext.h" @@ -66,7 +67,7 @@ namespace OHOS /* -------------------------------------------------------------------------- */ // 初始化Lable - TraingModel::GetInstance()->InitLabelExt(title, 125, 52, 200, 60, "label1", STR_TRAINING, DEFAULT_VECTOR_FONT_FILENAME, 30); + InitLabelExt(title, 125, 52, 200, 60, "label1", STR_TRAINING, DEFAULT_VECTOR_FONT_FILENAME, 30); scrollView->Add(title); // UIList 的适配器 p_TraingMoreListAdapter = new TraingMoreAdapter(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherItemView.cpp index 2edca4b9f..22a20d6b1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherItemView.cpp @@ -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" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherPresenter.cpp index 68da86f0d..6d2c9c632 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherPresenter.cpp @@ -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 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherView.cpp index 1d85526ce..34c0b85ff 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherView.cpp @@ -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 的适配器 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestItemView.cpp index 7b8efd3b5..6428fe889 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestItemView.cpp @@ -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" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestPresenter.cpp index b55faab23..17bae9c9f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestPresenter.cpp @@ -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 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestView.cpp index 7fdc25778..5e0d517b4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestView.cpp @@ -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 的适配器 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordView.h b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordView.h index c4e4d0ba5..41600ba2d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordView.h @@ -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