From: Caisking <3449750381@qq.com> Date: Fri, 22 Mar 2024 03:34:11 +0000 (+0800) Subject: 修改训练Slice的UI X-Git-Tag: release_V1.2.70_20241020_135402~1277 X-Git-Url: http://git.snicker.com.cn/img/static/gitweb.css?a=commitdiff_plain;h=0fb8bc641c38e390b235b084b503057d1b815b2f;p=mirrors%2FFD230.git 修改训练Slice的UI --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessagePresenter.h b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessagePresenter.h index 7fa48fc1f..a023c612a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessagePresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessagePresenter.h @@ -5,13 +5,15 @@ #include "Presenter.h" #include "MessageView.h" #include "message/include/MessageModel.h" +#include "components/ui_list.h" namespace OHOS { class MessageView; class MessageModel; class MessagePresenter : public Presenter, public UIView::OnClickListener, - public UIView::OnDragListener + public UIView::OnDragListener, + public UIList { public: MessagePresenter(); @@ -28,6 +30,7 @@ namespace OHOS // 因为继承了OnClickListener,所以有OnClick属性,至于参数,原函数也这样直接继承; bool OnClick(UIView &view, const ClickEvent &event) override; bool OnDrag(UIView &view, const DragEvent &event) override; + bool DragYInner(int16_t distance) override; MessageModel *p_MessageModel{nullptr}; }; } // namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp index c66e3bdf4..96367990d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp @@ -4,6 +4,9 @@ #include "message/include/MessagePresenter.h" #include "message/include/MessageAdapter.h" #include "message/include/MessageItemView.h" +#include "components/ui_abstract_scroll_bar.h" +#include "gfx_utils/graphic_log.h" + namespace OHOS { @@ -83,5 +86,35 @@ namespace OHOS } return true; } - + bool MessagePresenter::DragYInner(int16_t distance) + { +#if 0 + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DragYInner"); + int16_t listHeight = GetHeight(); + // 在原有代码的基础上修改,移除滚动空白区域的逻辑 + if (distance > 0) + { + if (childrenHead_) + { + distance = -childrenHead_->GetY(); // 下拉时不留空白区域,直接将子元素移动到顶部 + } + } + else + { + if (childrenTail_) + { + if (childrenTail_->GetRelativeRect().GetBottom() <= listHeight - childrenTail_->GetStyle(STYLE_MARGIN_BOTTOM)) + { + distance = 0; // 下拉时不留空白区域,直接将子元素移动到底部 + } + else + { + distance = listHeight - childrenTail_->GetY() - childrenTail_->GetRelativeRect().GetHeight() - childrenTail_->GetStyle(STYLE_MARGIN_BOTTOM); + } + } + } + return UIList::MoveOffset(0, distance); +#endif + } + } \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h b/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h index 00168090e..a15be2c0c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h @@ -58,7 +58,7 @@ namespace OHOS static constexpr const char *CALORIES_30_IMAGE = MODULES "/Calories_30.bin"; static constexpr const char *CONTROL_POINT_IMAGE = MODULES "/Control_point.bin"; static constexpr const char *DATA_POINT_IMAGE = MODULES "/Data_point.bin"; - static constexpr const char *GO_1_IMAGE = MODULES "/Go_1.bin"; + static constexpr const char *GO_1_IMAGE = MODULES "/Go.bin"; static constexpr const char *GO_2_IMAGE = MODULES "/Go_2.bin"; static constexpr const char *GPS_1_IMAGE = MODULES "/GPS_1.bin"; static constexpr const char *GPS_2_IMAGE = MODULES "/GPS_2.bin"; diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingControlView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingControlView.h index e96e78183..3f6f6eb4f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingControlView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingControlView.h @@ -24,9 +24,7 @@ namespace OHOS #define BUTTONPAUSE "button2" #define BUTTONCONTINUE "button3" -#define BUTTON_PAUSE_IMG_SRC "/user/res/Training/sport-pause.bin" -#define BUTTON_STOP_IMG_SRC "/user/res/Training/sport-stop.bin" -#define BUTTON_CONTINUE_IMG_SRC "/user/res/Training/sport-continue.bin" + class TraingControlPresenter; class TraingControlView : public View 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 379695cd2..6edc60de5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h @@ -61,7 +61,6 @@ namespace OHOS private: TraingModel(const TraingModel &) = delete; TraingModel &operator=(const TraingModel &) = delete; - QuickTraining *quickTraining_; }; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlView.cpp index 70123e696..1f0fe445d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlView.cpp @@ -6,9 +6,11 @@ #include "ui_resource_image.h" #include #include "components/ui_button.h" +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" + namespace OHOS { - static const char *imagePath_point = "/user/res/Training/control_point.bin"; static TraingControlView *g_pTraingControlView{nullptr}; @@ -129,16 +131,11 @@ namespace OHOS // 初始化Button InitButton(button1_, 100, 202, 100, 100, BUTTONSTOP); // Set additional property - char *button1defaultImgSrc = BUTTON_STOP_IMG_SRC; - char *button1triggeredImgSrc = nullptr; - button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc); + button1_->SetImageSrc(SPORT_STOP_IMAGE, nullptr); container_->Add(button1_); - InitButton(button2_, 255, 202, 100, 100, BUTTONPAUSE); // Set additional property - char *button2defaultImgSrc = BUTTON_PAUSE_IMG_SRC; - char *button2triggeredImgSrc = nullptr; - button2_->SetImageSrc(button2defaultImgSrc, button2triggeredImgSrc); + button2_->SetImageSrc(SPORT_PAUSE_IMAGE, nullptr); container_->Add(button2_); // 初始化Lable @@ -152,7 +149,7 @@ namespace OHOS container_->Add(label4_); // 初始化Image - InitImageView(image1_, 193, 421, 80, 20, "image1", imagePath_point); + InitImageView(image1_, 193, 421, 80, 20, "image1", CONTROL_POINT_IMAGE); container_->Add(image1_); } @@ -173,13 +170,13 @@ namespace OHOS { if (TraingControlPresenter::GetInstance()->test == "ç»§ç»­") { - //button2_->SetViewId(BUTTONCONTINUE); - button2_->SetImageSrc(BUTTON_CONTINUE_IMG_SRC, nullptr); + // button2_->SetViewId(BUTTONCONTINUE); + button2_->SetImageSrc(SPORT_CONTINUE_IMAGE, nullptr); } if (TraingControlPresenter::GetInstance()->test == "暂停") { - //button2_->SetViewId(BUTTONPAUSE); - button2_->SetImageSrc(BUTTON_PAUSE_IMG_SRC, nullptr); + // button2_->SetViewId(BUTTONPAUSE); + button2_->SetImageSrc(SPORT_PAUSE_IMAGE, nullptr); } } /******************************************************************************************************/ @@ -188,6 +185,7 @@ namespace OHOS void TraingControlView::DeInit() { // 删除Label + container_->RemoveAll(); if (label1_ != nullptr) { container_->Remove(label1_); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataView.cpp index 8a184e79b..659715f28 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataView.cpp @@ -6,15 +6,11 @@ #include "ui_resource_image.h" #include #include "components/ui_button.h" +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" + namespace OHOS { - static const char *imagePath_point = "/user/res/Training/data_point.bin"; - static const char *imagePath_progress = "/user/res/Training/progress.bin"; - static const char *imagePath_incoup = "/user/res/Training/inco_up.bin"; - static const char *imagePath_arrows = "/user/res/Training/arrows.bin"; - static const char *imagePath_strength = "/user/res/Training/sport-strength.bin"; - static const char *imagePath_note = "/user/res/Training/note.bin"; - static TraingDataView *g_pTraingDataView{nullptr}; TraingDataView::TraingDataView() @@ -132,11 +128,11 @@ namespace OHOS } // 初始化Image - InitImageView(image1_, 13, 13, 440, 386, "image1", imagePath_progress); - InitImageView(image2_, 208, 297, 20, 20, "image2", imagePath_arrows); - InitImageView(image3_, 98, 314, 270, 20, "image3", imagePath_strength); - InitImageView(image4_, 225, 396, 16, 10, "image4", imagePath_incoup); - InitImageView(image5_, 193, 421, 80, 20, "image5", imagePath_point); + InitImageView(image1_, 13, 13, 440, 386, "image1", PROGRESS_IMAGE); + InitImageView(image2_, 208, 297, 20, 20, "image2", ARROWS_IMAGE); + InitImageView(image3_, 98, 314, 270, 20, "image3", SPORT_STRENGTH_IMAGE); + InitImageView(image4_, 225, 396, 16, 10, "image4", INCO_UP_IMAGE); + InitImageView(image5_, 193, 421, 80, 20, "image5", CONTROL_POINT_IMAGE); container_->Add(image1_); container_->Add(image2_); container_->Add(image3_); @@ -156,9 +152,7 @@ namespace OHOS // 初始化Button InitButton(button1_, 275, 350, 26, 26, BUTTONNOTE); // Set additional property - static const char *button1defaultImgSrc = imagePath_note; - char *button1triggeredImgSrc = nullptr; - button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc); + button1_->SetImageSrc(NOTE_IMAGE, nullptr); container_->Add(button1_); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailView.cpp index 2f086718f..306679e2e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailView.cpp @@ -6,6 +6,9 @@ #include "ui_resource_image.h" #include #include "components/ui_button.h" +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" + namespace OHOS { static const char *imagePath_heartrate = "/user/res/Training/heartrat_30.bin"; @@ -132,13 +135,13 @@ namespace OHOS } // 初始化Image - InitImageView(image1_, 134, 58, 30, 30, "image1", imagePath_heartrate); - InitImageView(image2_, 44, 189, 30, 30, "image2", imagePath_mileage); - InitImageView(image3_, 297, 189, 30, 30, "image3", imagePath_step); - InitImageView(image4_, 129, 335, 30, 30, "image4", imagePath_calories); - InitImageView(image5_, 0, 160, 10, 466, "image5", imagePath_line1); - InitImageView(image6_, 233, 193, 80, 20, "image5", imagePath_line2); - InitImageView(image7_, 0, 306, 10, 466, "image5", imagePath_line1); + InitImageView(image1_, 134, 58, 30, 30, "image1", HEARTRATE_30_IMAGE); + InitImageView(image2_, 44, 189, 30, 30, "image2", MILEAGE_30_IMAGE); + InitImageView(image3_, 297, 189, 30, 30, "image3", STEP_30_IMAGE); + InitImageView(image4_, 129, 335, 30, 30, "image4", CALORIES_30_IMAGE); + InitImageView(image5_, 0, 160, 10, 466, "image5", LINE_1_IMAGE); + InitImageView(image6_, 233, 193, 80, 20, "image5", LINE_2_IMAGE); + InitImageView(image7_, 0, 306, 10, 466, "image5", LINE_1_IMAGE); container_->Add(image1_); container_->Add(image2_); container_->Add(image3_); @@ -168,6 +171,7 @@ namespace OHOS /* DeInit:删除组件 */ void TraingDetailView::DeInit() { + container_->RemoveAll(); UIView *view = static_cast(container_)->GetChildrenHead(); while (view != nullptr) { 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 db4f86561..19496b139 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp @@ -6,14 +6,11 @@ #include "ui_resource_image.h" #include #include "components/ui_button.h" +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" + namespace OHOS { - static const char *imagePath_path = "/user/res/Training/path.bin"; - static const char *imagePath_bubble = "/user/res/Training/bubble.bin"; - static const char *imagePath_bubblepiont = "/user/res/Training/bubble_piont.bin"; - static const char *imagePath_Line = "/user/res/Training/Line.bin"; - static const char *imagePath_spot = "/user/res/Training/Walking_54.bin"; - static const char *imagePath_incoup = "/user/res/Training/inco_up_40.bin"; static TraingEnddataView *g_pTraingEnddataView{nullptr}; @@ -149,16 +146,16 @@ namespace OHOS scrollView1_->SetVisible(true); // 初始化Image - InitImageView(image1_, 200, 131, 80, 48, "image1", imagePath_bubble); - InitImageView(image2_, 230, 183, 20, 20, "image2", imagePath_bubblepiont); - InitImageView(image3_, 96, 118, 271, 233, "image3", imagePath_path); - InitImageView(image4_, 212, 402, 40, 40, "image4", imagePath_incoup); - InitImageView(image5_, 80, 470, 54, 80, "image5", imagePath_spot); - InitImageView(image6_, 97, 552, 80, 20, "image6", imagePath_Line); - InitImageView(image8_, 97, 682, 80, 20, "image6", imagePath_Line); - InitImageView(image9_, 97, 812, 80, 20, "image6", imagePath_Line); - InitImageView(image10_, 97, 942, 80, 20, "image6", imagePath_Line); - InitImageView(image11_, 97, 1072, 80, 20, "image6", imagePath_Line); + InitImageView(image1_, 200, 131, 80, 48, "image1", BUBBLE_IMAGE); + InitImageView(image2_, 230, 183, 20, 20, "image2", PIONT_BUBBLE_IMAGE); + InitImageView(image3_, 96, 118, 271, 233, "image3", PATH_IMAGE); + InitImageView(image4_, 212, 402, 40, 40, "image4", INCO_UP_40_IMAGE); + InitImageView(image5_, 80, 470, 54, 80, "image5", WALKING_54_IMAGE); + InitImageView(image6_, 97, 552, 80, 20, "image6", LINE_IMAGE); + InitImageView(image8_, 97, 682, 80, 20, "image6", LINE_IMAGE); + InitImageView(image9_, 97, 812, 80, 20, "image6", LINE_IMAGE); + InitImageView(image10_, 97, 942, 80, 20, "image6", LINE_IMAGE); + InitImageView(image11_, 97, 1072, 80, 20, "image6", LINE_IMAGE); scrollView1_->Add(image3_); scrollView1_->Add(image6_); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2View.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2View.cpp index 0285ef22f..6d2569217 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2View.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2View.cpp @@ -6,10 +6,11 @@ #include "ui_resource_image.h" #include #include "components/ui_button.h" +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" + namespace OHOS { - static const char *imagePath_no = "/user/res/Training/no.bin"; - static const char *imagePath_yes = "/user/res/Training/yes.bin"; static TraingEndnote2View *g_pTraingEndnote2View{nullptr}; @@ -136,15 +137,11 @@ namespace OHOS InitButton(button1_, 111, 299, 100, 100, BUTTONNO); // Set additional property - const char *button1defaultImgSrc = imagePath_no; - char *button1triggeredImgSrc = nullptr; - button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc); + button1_->SetImageSrc(NO_IMAGE, nullptr); InitButton(button2_, 256, 299, 100, 100, BUTTONYES); // Set additional property - const char *button2defaultImgSrc = imagePath_yes; - char *button2triggeredImgSrc = nullptr; - button2_->SetImageSrc(button2defaultImgSrc, button2triggeredImgSrc); + button2_->SetImageSrc(YES_IMAGE, nullptr); container_->Add(button1_); container_->Add(button2_); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnoteView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnoteView.cpp index e2c1d810b..44e93a6e3 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnoteView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnoteView.cpp @@ -6,6 +6,9 @@ #include "ui_resource_image.h" #include #include "components/ui_button.h" +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" + namespace OHOS { static const char *imagePath_no = "/user/res/Training/no.bin"; @@ -136,15 +139,11 @@ namespace OHOS InitButton(button1_, 111, 299, 100, 100, BUTTONNO); // Set additional property - const char *button1defaultImgSrc = imagePath_no; - char *button1triggeredImgSrc = nullptr; - button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc); + button1_->SetImageSrc(NO_IMAGE, nullptr); InitButton(button2_, 256, 299, 100, 100, BUTTONYES); // Set additional property - const char *button2defaultImgSrc = imagePath_yes; - char *button2triggeredImgSrc = nullptr; - button2_->SetImageSrc(button2defaultImgSrc, button2triggeredImgSrc); + button2_->SetImageSrc(YES_IMAGE, nullptr); container_->Add(button1_); container_->Add(button2_); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSView.cpp index 46d4807c6..5b05f353d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSView.cpp @@ -6,10 +6,11 @@ #include "ui_resource_image.h" #include #include "components/ui_button.h" +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" + namespace OHOS { - static const char *imagePath_heartrate = "/user/res/Training/heartrate_1.bin"; - static const char *imagePath_GPS = "/user/res/Training/GPS_1.bin"; static TraingGPSView *g_pTraingGPSView{nullptr}; TraingGPSView::TraingGPSView() @@ -137,16 +138,14 @@ namespace OHOS InitLabel(label4_, 361, 237, 54, 41, "lable4", "GPS", DEFAULT_VECTOR_FONT_FILENAME, 35); container_->Add(label4_); // 初始化image - InitImageView(image1_, 48, 193, 40, 40, "image1", imagePath_heartrate); - InitImageView(image2_, 375, 193, 40, 40, "image2", imagePath_GPS); + InitImageView(image1_, 48, 193, 40, 40, "image1", HEARTRATE_1_IMAGE); + InitImageView(image2_, 375, 193, 40, 40, "image2", GPS_1_IMAGE); container_->Add(image1_); container_->Add(image2_); // 初始化Button InitButton(button1_, 133, 133, 200, 200, BUTTONGO); - // Set additional property - char *button1defaultImgSrc = "/user/res/Training/Go.bin"; - char *button1triggeredImgSrc = nullptr; - button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc); + + button1_->SetImageSrc(GO_1_IMAGE, nullptr); InitButton(button2_, 160, 370, 146, 35, BUTTONSET); button2_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000); // 设置为透明按键 @@ -159,6 +158,7 @@ namespace OHOS /* DeInit:删除组件*/ void TraingGPSView::DeInit() { + container_->RemoveAll(); UIView *view = static_cast(container_)->GetChildrenHead(); while (view != nullptr) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSbackView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSbackView.cpp index 2244133b6..4fc174464 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSbackView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSbackView.cpp @@ -6,9 +6,10 @@ #include "ui_resource_image.h" #include #include "components/ui_button.h" +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" namespace OHOS { - static const char *imagePath_warning = "/user/res/Training/back.bin"; static TraingGPSbackView *g_pTraingGPSbackView{nullptr}; TraingGPSbackView::TraingGPSbackView() @@ -133,7 +134,7 @@ namespace OHOS container_->Add(label2_); // 初始化image - InitImageView(image1_, 193, 140, 40, 40, "image1", imagePath_warning); + InitImageView(image1_, 193, 140, 40, 40, "image1", BACK_IMAGE); container_->Add(image1_); // 初始化Button diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlackView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlackView.cpp index 383e6a654..f3b40e9ca 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlackView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlackView.cpp @@ -6,10 +6,12 @@ #include "ui_resource_image.h" #include #include "components/ui_button.h" +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" + namespace OHOS { - static const char *imagePath_heartrate = "/user/res/Training/heartrate_2.bin"; - static const char *imagePath_GPS = "/user/res/Training/GPS_2.bin"; + static TraingGPSlackView *g_pTraingGPSlackView{nullptr}; TraingGPSlackView::TraingGPSlackView() @@ -137,8 +139,8 @@ namespace OHOS InitLabel(label4_, 361, 237, 54, 41, "lable4", "--", DEFAULT_VECTOR_FONT_FILENAME, 35); container_->Add(label4_); // 初始化image - InitImageView(image1_, 48, 193, 40, 40, "image1", imagePath_heartrate); - InitImageView(image2_, 375, 193, 40, 40, "image2", imagePath_GPS); + InitImageView(image1_, 48, 193, 40, 40, "image1", HEARTRATE_2_IMAGE); + InitImageView(image2_, 375, 193, 40, 40, "image2", GPS_2_IMAGE); container_->Add(image1_); container_->Add(image2_); // 初始化Button diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlostView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlostView.cpp index aa275c63d..76c8d1331 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlostView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlostView.cpp @@ -6,9 +6,11 @@ #include "ui_resource_image.h" #include #include "components/ui_button.h" +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" namespace OHOS { - static const char *imagePath_warning = "/user/res/Training/warning.bin"; + static TraingGPSlostView *g_pTraingGPSlostView{nullptr}; TraingGPSlostView::TraingGPSlostView() @@ -131,19 +133,16 @@ namespace OHOS container_->Add(label1_); InitLabel(label2_, 55, 253, 146, 35, "label2", "当前位置搜索不到GPS信号", DEFAULT_VECTOR_FONT_FILENAME, 30); container_->Add(label2_); - + // 初始化image - InitImageView(image1_, 193, 140, 40, 40, "image1", imagePath_warning); + InitImageView(image1_, 193, 140, 40, 40, "image1", WARNING_IMAGE); container_->Add(image1_); // 初始化Button InitButton(button1_, 0, 366, 466, 100, BUTTONOK); // Set additional property - char *button1defaultImgSrc = "/user/res/Training/buttonok.bin"; - char *button1triggeredImgSrc = nullptr; - button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc); + button1_->SetImageSrc(BUTTONOK_IMAGE, nullptr); container_->Add(button1_); - } /* DeInit:删除组件*/ void TraingGPSlostView::DeInit() diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSnoteView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSnoteView.cpp index 34c4f75fa..b50ef5243 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSnoteView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSnoteView.cpp @@ -6,9 +6,11 @@ #include "ui_resource_image.h" #include #include "components/ui_button.h" +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" + namespace OHOS { - static const char *imagePath_warning = "/user/res/Training/warning.bin"; static TraingGPSnoteView *g_pTraingGPSnoteView{nullptr}; @@ -144,7 +146,7 @@ namespace OHOS scrollView1_->SetVisible(true); // 初始化Image - InitImageView(image1_, 193, 111, 80, 80, "image1", imagePath_warning); + InitImageView(image1_, 193, 111, 80, 80, "image1", WARNING_IMAGE); scrollView1_->Add(image1_); // 初始化button diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSsetView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSsetView.cpp index bd19af445..b1f85d85a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSsetView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSsetView.cpp @@ -6,16 +6,15 @@ #include "ui_resource_image.h" #include #include "components/ui_button.h" +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" + namespace OHOS { // 定义全局变量 - static char *imagePaths[] = {"/user/res/Training/time.bin", - "/user/res/Training/mileage.bin", - "/user/res/Training/calories.bin", - "/user/res/Training/walking.bin"}; + static const char *imagePaths[] = {TIME_IMAGE, MILEAGE_IMAGE, CALORIES_IMAGE, WARNING_IMAGE}; static char *text[] = {"时长", "距离", "卡路里", "步数"}; - static const char *imagePath_iocn = "/user/res/Training/icon.bin"; static TraingGPSsetView *g_pTraingGPSsetView{nullptr}; TraingGPSsetView::TraingGPSsetView() @@ -146,9 +145,18 @@ namespace OHOS for (int i = 0; i < 4; ++i) { IconItemNode *listData = new IconItemNode(); - listData->imagePath = imagePaths[i]; + // 检查是否需要分配内存空间 + if (listData->imagePath == nullptr) + { + listData->imagePath = new char[strlen(imagePaths[i]) + 1]; + } + strcpy(listData->imagePath, imagePaths[i]); listData->txt = text[i]; list1data_->PushBack(listData); + + // 释放内存空间 + // delete[] listData->imagePath; + // delete listData; } if (list1adapter_ == nullptr) @@ -201,10 +209,10 @@ namespace OHOS scrollView1_->Add(button4_); // 初始化Image - InitImageView(image1_, 380, 160, 100, 100, "image1", imagePath_iocn); - InitImageView(image2_, 380, 280, 100, 100, "image2", imagePath_iocn); - InitImageView(image3_, 380, 400, 100, 100, "image3", imagePath_iocn); - InitImageView(image4_, 380, 520, 100, 100, "image4", imagePath_iocn); + InitImageView(image1_, 380, 160, 100, 100, "image1", ICON_IMAGE); + InitImageView(image2_, 380, 280, 100, 100, "image2", ICON_IMAGE); + InitImageView(image3_, 380, 400, 100, 100, "image3", ICON_IMAGE); + InitImageView(image4_, 380, 520, 100, 100, "image4", ICON_IMAGE); scrollView1_->Add(image1_); scrollView1_->Add(image2_); scrollView1_->Add(image3_); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingLimitView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingLimitView.cpp index 5ebde5cf3..a45e392ef 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingLimitView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingLimitView.cpp @@ -6,11 +6,13 @@ #include "ui_resource_image.h" #include #include "components/ui_button.h" + +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" namespace OHOS { static char *text[] = {"一般极限运动", "滑板", "高空弹跳/蹦极", "跑酷", "BMX", "定向越野", "跳伞", "铁人三项运动"}; - static const char *imagePath_iocn = "/user/res/Training/icon.bin"; static TraingLimitView *g_pTraingLimitView{nullptr}; @@ -144,7 +146,7 @@ namespace OHOS for (int i = 0; i < 8; ++i) { IconItemNode *listData = new IconItemNode(); - //listData->imagePath = imagePaths[i]; + // listData->imagePath = imagePaths[i]; listData->txt = text[i]; list1data_->PushBack(listData); } @@ -206,14 +208,14 @@ namespace OHOS scrollView1_->Add(button7_); scrollView1_->Add(button8_); // 初始化image - InitImageView(image1_, 360, 160, 100, 100, "image1", imagePath_iocn); - InitImageView(image2_, 360, 280, 100, 100, "image2", imagePath_iocn); - InitImageView(image3_, 360, 400, 100, 100, "image3", imagePath_iocn); - InitImageView(image4_, 360, 520, 100, 100, "image4", imagePath_iocn); - InitImageView(image5_, 360, 640, 100, 100, "image5", imagePath_iocn); - InitImageView(image6_, 360, 760, 100, 100, "image6", imagePath_iocn); - InitImageView(image7_, 360, 880, 100, 100, "image7", imagePath_iocn); - InitImageView(image8_, 360, 1000, 100, 100, "image8", imagePath_iocn); + InitImageView(image1_, 360, 160, 100, 100, "image1", ICON_IMAGE); + InitImageView(image2_, 360, 280, 100, 100, "image2", ICON_IMAGE); + InitImageView(image3_, 360, 400, 100, 100, "image3", ICON_IMAGE); + InitImageView(image4_, 360, 520, 100, 100, "image4", ICON_IMAGE); + InitImageView(image5_, 360, 640, 100, 100, "image5", ICON_IMAGE); + InitImageView(image6_, 360, 760, 100, 100, "image6", ICON_IMAGE); + InitImageView(image7_, 360, 880, 100, 100, "image7", ICON_IMAGE); + InitImageView(image8_, 360, 1000, 100, 100, "image8", ICON_IMAGE); scrollView1_->Add(image1_); scrollView1_->Add(image2_); scrollView1_->Add(image3_); @@ -229,6 +231,7 @@ namespace OHOS /* DeInit:删除组件*/ void TraingLimitView::DeInit() { + container_->RemoveAll(); if (label1_ != nullptr) { delete label1_; @@ -332,6 +335,7 @@ namespace OHOS } if (scrollView1_ != nullptr) { + scrollView1_->RemoveAll(); delete scrollView1_; scrollView1_ = nullptr; } 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 72d54ae93..dc36572bd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp @@ -8,8 +8,7 @@ namespace OHOS TraingModel ::TraingModel() { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingModel::TraingModel()"); - quickTraining_ = new QuickTraining(); // 为quickTraining_赋初值 -#if 1 +#if 0 printf(" quickTraining_--training1_Text: %s\n", quickTraining_->training1_Text.c_str()); printf(" quickTraining_--training1_Image: %s\n", quickTraining_->training1_Image.c_str()); printf(" quickTraining_--training2_Text: %s\n", quickTraining_->training2_Text.c_str()); @@ -35,7 +34,7 @@ namespace OHOS */ void TraingModel::SetQuickTraining(QuickTraining *quickTraining) { - quickTraining_ = quickTraining; + // quickTraining_ = quickTraining; } /*** * @description: @@ -44,6 +43,7 @@ namespace OHOS */ QuickTraining *TraingModel::GetQuickTraining() const { + QuickTraining *quickTraining_ = new QuickTraining(); // 为quickTraining_赋初值 return quickTraining_; } /*** diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMoreView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMoreView.cpp index f8210771a..23da15b02 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMoreView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMoreView.cpp @@ -1,5 +1,7 @@ #include "traing/include/TraingMoreView.h" +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" #include "common/image_cache_manager.h" #include "UiConfig.h" @@ -9,17 +11,9 @@ namespace OHOS { // 定义全局变量 - static char *imagePaths[] = {"/user/res/Training/Fitness.bin", - "/user/res/Training/Dance.bin", - "/user/res/Training/Rest.bin", - "/user/res/Training/Ball.bin", - "/user/res/Training/Swimming.bin", - "/user/res/Training/Ice.bin", - "/user/res/Training/Limit.bin", - "/user/res/Training/Other.bin"}; + static const char *imagePaths[] = {FITNESS_IMAGE, DANCE_IMAGE, REST_IMAGE, BALL_IMAGE, SWIMMING_IMAGE, ICE_IMAGE, LIMIT_IMAGE, OTHER_IMAGE}; static char *text[] = {"健身类", "舞蹈类", "休闲运动", "球类", "水上运动", "冰上运动", "极限运动", "其他"}; - static const char *imagePath_iocn = "/user/res/Training/icon.bin"; static TraingMoreView *g_pTraingMoreView{nullptr}; @@ -153,9 +147,18 @@ namespace OHOS for (int i = 0; i < 8; ++i) { IconItemNode *listData = new IconItemNode(); - listData->imagePath = imagePaths[i]; + // 检查是否需要分配内存空间 + if (listData->imagePath == nullptr) + { + listData->imagePath = new char[strlen(imagePaths[i]) + 1]; + } + strcpy(listData->imagePath, imagePaths[i]); listData->txt = text[i]; list1data_->PushBack(listData); + + // 释放内存空间 + // delete[] listData->imagePath; + // delete listData; } if (list1adapter_ == nullptr) @@ -217,14 +220,14 @@ namespace OHOS scrollView1_->Add(button7_); scrollView1_->Add(button8_); // 初始化image - InitImageView(image1_, 360, 160, 100, 100, "image1", imagePath_iocn); - InitImageView(image2_, 360, 280, 100, 100, "image2", imagePath_iocn); - InitImageView(image3_, 360, 400, 100, 100, "image3", imagePath_iocn); - InitImageView(image4_, 360, 520, 100, 100, "image4", imagePath_iocn); - InitImageView(image5_, 360, 640, 100, 100, "image5", imagePath_iocn); - InitImageView(image6_, 360, 760, 100, 100, "image6", imagePath_iocn); - InitImageView(image7_, 360, 880, 100, 100, "image7", imagePath_iocn); - InitImageView(image8_, 360, 1000, 100, 100, "image8", imagePath_iocn); + InitImageView(image1_, 360, 160, 100, 100, "image1", ICON_IMAGE); + InitImageView(image2_, 360, 280, 100, 100, "image2", ICON_IMAGE); + InitImageView(image3_, 360, 400, 100, 100, "image3", ICON_IMAGE); + InitImageView(image4_, 360, 520, 100, 100, "image4", ICON_IMAGE); + InitImageView(image5_, 360, 640, 100, 100, "image5", ICON_IMAGE); + InitImageView(image6_, 360, 760, 100, 100, "image6", ICON_IMAGE); + InitImageView(image7_, 360, 880, 100, 100, "image7", ICON_IMAGE); + InitImageView(image8_, 360, 1000, 100, 100, "image8", ICON_IMAGE); scrollView1_->Add(image1_); scrollView1_->Add(image2_); scrollView1_->Add(image3_); @@ -240,6 +243,7 @@ namespace OHOS /* DeInit:删除组件*/ void TraingMoreView::DeInit() { + container_->RemoveAll(); if (label1_ != nullptr) { delete label1_; @@ -343,6 +347,7 @@ namespace OHOS } if (scrollView1_ != nullptr) { + scrollView1_->RemoveAll(); delete scrollView1_; scrollView1_ = nullptr; } 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 0ffafd017..8f853ceb2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp @@ -6,6 +6,9 @@ #include "ui_resource_image.h" #include #include "components/ui_button.h" +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" + namespace OHOS { @@ -111,9 +114,7 @@ namespace OHOS // 初始化Button InitButton(button1_, 133, 133, 200, 200, BUTTONGO); // Set additional property - char *button1defaultImgSrc = "/user/res/Training/Go.bin"; - char *button1triggeredImgSrc = nullptr; - button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc); + button1_->SetImageSrc(GO_1_IMAGE, nullptr); InitButton(button2_, 160, 370, 146, 35, BUTTONSET); button2_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000);//设置为透明按键 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliView.cpp index 5d5ff2a63..c15f55647 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliView.cpp @@ -10,7 +10,8 @@ #include #include #include - +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" namespace OHOS { @@ -180,9 +181,7 @@ namespace OHOS // 初始化Button InitButton(button1_, 0, 366, 466, 100, BUTTONOK); // Set additional property - char *button1defaultImgSrc = "/user/res/Training/buttonok.bin"; - char *button1triggeredImgSrc = nullptr; - button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc); + button1_->SetImageSrc(BUTTONOK_IMAGE, nullptr); container_->Add(button1_); } /* DeInit:删除组件 */ @@ -226,7 +225,7 @@ namespace OHOS { if (!viewiInitStatus) { - //printf("init traingsetcaluliview\n"); + // printf("init traingsetcaluliview\n"); InitView(); viewiInitStatus = true; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistView.cpp index 634ea19e9..a979c3129 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistView.cpp @@ -10,6 +10,8 @@ #include #include #include +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" namespace OHOS { @@ -180,9 +182,8 @@ namespace OHOS // 初始化Button InitButton(button1_, 0, 366, 466, 100, BUTTONOK); // Set additional property - char *button1defaultImgSrc = "/user/res/Training/buttonok.bin"; - char *button1triggeredImgSrc = nullptr; - button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc); + + button1_->SetImageSrc(BUTTONOK_IMAGE, nullptr); container_->Add(button1_); } /* DeInit:删除组件 */ @@ -226,7 +227,7 @@ namespace OHOS { if (!viewiInitStatus) { - //printf("init TraingSetDistview\n"); + // printf("init TraingSetDistview\n"); InitView(); viewiInitStatus = true; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptView.cpp index 8bd73c1e0..5f5519e44 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptView.cpp @@ -10,7 +10,8 @@ #include #include #include - +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" namespace OHOS { @@ -180,9 +181,7 @@ namespace OHOS // 初始化Button InitButton(button1_, 0, 366, 466, 100, BUTTONOK); // Set additional property - char *button1defaultImgSrc = "/user/res/Training/buttonok.bin"; - char *button1triggeredImgSrc = nullptr; - button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc); + button1_->SetImageSrc(BUTTONOK_IMAGE, nullptr); container_->Add(button1_); } /* DeInit:删除组件 */ diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimeView.cpp index e123b4e5a..158f55661 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimeView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimeView.cpp @@ -10,7 +10,8 @@ #include #include #include - +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" namespace OHOS { @@ -180,9 +181,7 @@ namespace OHOS // 初始化Button InitButton(button1_, 0, 366, 466, 100, BUTTONOK); // Set additional property - char *button1defaultImgSrc = "/user/res/Training/buttonok.bin"; - char *button1triggeredImgSrc = nullptr; - button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc); + button1_->SetImageSrc(BUTTONOK_IMAGE, nullptr); container_->Add(button1_); } /* DeInit:删除组件 */ 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 02a111438..5d01b3b2f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp @@ -6,11 +6,11 @@ #include "ui_resource_image.h" #include #include "components/ui_button.h" +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" + namespace OHOS { - static const char *imagePath_iocn = "/user/res/Training/icon.bin"; - static const char *imagePath_time = "/user/res/Training/time.bin"; - static const char *imagePath_calories = "/user/res/Training/calories.bin"; static TraingSetView *g_pTraingSetView{nullptr}; @@ -147,10 +147,10 @@ namespace OHOS container_->Add(label5_); // 初始化Image - InitImageView(image1_, 70, 150, 100, 100, "image1", imagePath_time); - InitImageView(image2_, 70, 270, 100, 100, "image2", imagePath_calories); - InitImageView(image3_, 380, 160, 100, 100, "image3", imagePath_iocn); - InitImageView(image4_, 380, 280, 100, 100, "image4", imagePath_iocn); + InitImageView(image1_, 70, 150, 100, 100, "image1", TIME_IMAGE); + InitImageView(image2_, 70, 270, 100, 100, "image2", CALORIES_IMAGE); + InitImageView(image3_, 380, 160, 100, 100, "image3", ICON_IMAGE); + InitImageView(image4_, 380, 280, 100, 100, "image4", ICON_IMAGE); container_->Add(image1_); container_->Add(image2_); container_->Add(image3_); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongView.cpp index e9b58b828..c805d9ef7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongView.cpp @@ -6,12 +6,12 @@ #include "ui_resource_image.h" #include #include "components/ui_button.h" +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" + namespace OHOS { - static const char *imagePath_blue = "/user/res/Training/bule.bin"; - static const char *imagePath_yellow = "/user/res/Training/yellow.bin"; - static const char *imagePath_orange = "/user/res/Training/orange.bin"; - static const char *imagePath_green = "/user/res/Training/green.bin"; + static TraingStrongView *g_pTraingStrongView{nullptr}; @@ -163,10 +163,10 @@ namespace OHOS scrollView1_->Add(label6_); // 初始化Image - InitImageView(image1_, 510, 60, 100, 100, "image1", imagePath_blue); - InitImageView(image2_, 550, 60, 100, 100, "image2", imagePath_green); - InitImageView(image3_, 590, 60, 100, 100, "image3", imagePath_orange); - InitImageView(image4_, 630, 60, 100, 100, "image4", imagePath_yellow); + InitImageView(image1_, 510, 60, 100, 100, "image1", POINT_BLUE_IMAGE); + InitImageView(image2_, 550, 60, 100, 100, "image2", POINT_GREEN_IMAGE); + InitImageView(image3_, 590, 60, 100, 100, "image3", POINT_ORANGE_IMAGE); + InitImageView(image4_, 630, 60, 100, 100, "image4", POINT_YELLOW_IMAGE); scrollView1_->Add(image1_); scrollView1_->Add(image2_); scrollView1_->Add(image3_); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinView.cpp index 6b16ccd90..70230577d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinView.cpp @@ -6,10 +6,12 @@ #include "ui_resource_image.h" #include #include "components/ui_button.h" +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" namespace OHOS { - static const char *imagePath_win = "/user/res/Training/win.bin"; + static TraingWinView *g_pTraingWinView{nullptr}; TraingWinView::TraingWinView() { @@ -224,7 +226,7 @@ namespace OHOS */ // 初始化图片数组 - const char *basePath = "/user/res/Training/win/"; + const char *basePath = "/user/res/Training/training_GIF/win/"; const char *fileExtension = "bin"; const char **imagePaths = CreateImagePathsArray(basePath, fileExtension, 94); InitImageAnimatorSource(imageAnimator, imagePaths, 94, 173, 100, 120, 120, "imageAnimator1", 10); @@ -234,9 +236,8 @@ namespace OHOS // 初始化Button InitButton(button1_, 0, 366, 466, 100, BUTTONOK); // Set additional property - char *button1defaultImgSrc = "/user/res/Training/buttonok.bin"; - char *button1triggeredImgSrc = nullptr; - button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc); + + button1_->SetImageSrc(BUTTONOK_IMAGE, nullptr); container_->Add(button1_); }