From: Caisking <3449750381@qq.com> Date: Mon, 1 Apr 2024 10:21:36 +0000 (+0800) Subject: 优化主界面训练卡片,需要更新资源 X-Git-Tag: release_V1.2.70_20241020_135402~1239^2~1 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=a560b9d42f49554400589a80e856689775818404;p=mirrors%2FFD230.git 优化主界面训练卡片,需要更新资源 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp index 9b8718045..7d451916e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp @@ -38,7 +38,7 @@ namespace OHOS {DROPDOWN_CLICK_SETTING, VIEW_SETTING}, // 设置 //{DROPDOWN_CLICK_DNOTDISTURB, VIEW_FIND_PHONE}, // 勿扰 {DROPDOWN_CLICK_SAVEELE, VIEW_SAVEELE}, // 省电模式 - {DROPDOWN_CLICK_FINDMYPHONE,VIEW_FIND_PHONE}, + {DROPDOWN_CLICK_FINDMYPHONE, VIEW_FIND_PHONE}, }; static MainPresenterSample *g_pMainPresenterSample = nullptr; @@ -308,9 +308,9 @@ namespace OHOS dynamic_cast(view_->GetViewById(WATCH_FACE))->UpdateTime(); #endif } - else if (view_->GetHorCurrentPage() == BloodOxygen) + else if (view_->GetHorCurrentPage() == BLOODOXGEN) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodCardView"); + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodCardView"); } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp index c66c511d8..687f8a245 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp @@ -29,7 +29,7 @@ namespace OHOS static const MainViewMapper PageMapper[] = { {WATCH_FACE, &MainViewSample::InitWatchFacePage}, {HEART_RATE, &MainViewSample::InitHeartRatePage}, - {BloodOxygen, &MainViewSample::InitBloodOxygenPage}, + {BLOODOXGEN, &MainViewSample::InitBloodOxygenPage}, {TRAINING, &MainViewSample::InitTrainingPage}, {COMPASS, &MainViewSample::InitCompassPage}, {WEATHER, &MainViewSample::InitWeatherPage}, diff --git a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirView.cpp b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirView.cpp index 914eb216f..152a43396 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirView.cpp @@ -457,7 +457,7 @@ namespace OHOS labelButton7_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); // Set additional property - labelButton7_->SetText("小梦同学(客服热线)"); + labelButton7_->SetText("KUMI同学(客服热线)"); labelButton7_->SetTextColor(Color::GetColorFromRGBA(0xcc, 0xcc, 0xcc, 0xff)); labelButton7_->SetAlign(TEXT_ALIGNMENT_RIGHT); labelButton7_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 26); diff --git a/code/sdk/application/wearable/fd230app/nativeui/screensetting/include/ScreenModels.h b/code/sdk/application/wearable/fd230app/nativeui/screensetting/include/ScreenModels.h index 6d1190e48..a37e746a7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/screensetting/include/ScreenModels.h +++ b/code/sdk/application/wearable/fd230app/nativeui/screensetting/include/ScreenModels.h @@ -20,7 +20,7 @@ namespace OHOS WATCH_FACE = 0, HEART_RATE, TRAINING, - BloodOxygen, + BLOODOXGEN, COMPASS, WEATHER, MUSIC_PLAYER, 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 ca983b7eb..a6104ce71 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp @@ -24,23 +24,23 @@ namespace OHOS static constexpr uint16_t TITLE_LABEL_Y = 52; static constexpr uint16_t BTN1_LABEL_X = 65; - static constexpr uint16_t BTN1_LABEL_Y = 210; + static constexpr uint16_t BTN1_LABEL_Y = 205; static constexpr uint16_t BTN2_LABEL_X = 206; - static constexpr uint16_t BTN2_LABEL_Y = 210; + static constexpr uint16_t BTN2_LABEL_Y = 205; static constexpr uint16_t BTN3_LABEL_X = 65; - static constexpr uint16_t BTN3_LABEL_Y = 365; + static constexpr uint16_t BTN3_LABEL_Y = 355; // 图片设置 static constexpr uint16_t BTN_IMAGE_SIZE = 100; static constexpr uint16_t BTN1_IMAGE_X = 126; - static constexpr uint16_t BTN1_IMAGE_Y = 143; + static constexpr uint16_t BTN1_IMAGE_Y = 148; static constexpr uint16_t BTN2_IMAGE_X = 276; - static constexpr uint16_t BTN2_IMAGE_Y = 143; + static constexpr uint16_t BTN2_IMAGE_Y = 148; static constexpr uint16_t BTN3_IMAGE_X = 129; - static constexpr uint16_t BTN3_IMAGE_Y = 293; + static constexpr uint16_t BTN3_IMAGE_Y = 298; static constexpr uint16_t BTNMORE_IMAGE_X = 276; static constexpr uint16_t BTNMORE_IMAGE_Y = 324; diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/Training_CardView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/Training_CardView.h index cdd377c49..74a89df5d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/Training_CardView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/Training_CardView.h @@ -54,7 +54,7 @@ namespace OHOS UILabelButtonExt *Button3 = nullptr; UILabelButtonExt *ButtonMore = nullptr; - UILabel *titleLabel = nullptr; + UILabelExt *titleLabel = nullptr; UIImageView *image1 = nullptr; UIImageView *image2 = nullptr; UIImageView *image3 = nullptr; 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 4856389c1..e9f0264a9 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 @@ -3,7 +3,7 @@ #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" -#include"language/font/ui_resource_string.h" +#include "language/font/ui_resource_string.h" #include "UiConfig.h" #include "ui_resource_image.h" #include @@ -12,16 +12,21 @@ #include "common/image_cache_manager.h" #include "MainPresenterSample.h" #include "traing/training_card/include/Training_CardPresenter.h" +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" + namespace OHOS { - static Training_CardView *g_pTraining_CardView{nullptr}; + static Training_CardView *g_pTraining_CardView{nullptr}; + static QuickTraining *data = new QuickTraining; Training_CardView::Training_CardView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Training_CardView::Training_CardView"); +WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Training_CardView::Training_CardView"); SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); g_pTraining_CardView = this; - } + data = TraingModel::GetInstance()->GetQuickTraining(); + } Training_CardView::~Training_CardView() { @@ -29,34 +34,18 @@ namespace OHOS RemoveAll(); DeInit(); g_pTraining_CardView = nullptr; + delete data; } Training_CardView *Training_CardView::GetInstance() { return g_pTraining_CardView; } - bool Training_CardView::InitLable() +bool Training_CardView::InitLable() { - // 检查标签指针是否为空 - if (titleLabel == nullptr) - { - titleLabel = new UILabel(); - } - // 设置标签的位置和大小 - titleLabel->SetPosition(173, 52); - titleLabel->Resize(200, 60); - // 设置标签的视图 ID - titleLabel->SetViewId("titleLabel"); - // 设置标签的样式 - titleLabel->SetStyle(STYLE_TEXT_FONT, 30); - titleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - // 设置标签的文本和其他属性 - titleLabel->SetText("快速训练"); - titleLabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); - titleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - titleLabel->SetRollSpeed(0); + // 初始化标签 + TraingModel::GetInstance()->InitLabelExt(titleLabel, 130, 52, 200, 60, "title_label", STR_RAPID_TRAINING, DEFAULT_VECTOR_FONT_FILENAME, 30); Add(titleLabel); - return true; } /* -------------------------------------------------------------------------- */ @@ -95,7 +84,7 @@ namespace OHOS { struct ButtonInfo { - std::string text; + UIResourceTextId textid; char *viewid; uint32_t defaultImgSrc; UILabelButtonExt *button; @@ -104,10 +93,10 @@ namespace OHOS }; ButtonInfo buttons[] = { - {"健走", BUTTON1, TRAINING_BUTTONGROUND2, Button1, 86, 118}, - {"骑行", BUTTON2, TRAINING_BOUTTONGROUND, Button2, 236, 118}, - {"跑步", BUTTON3, TRAINING_BOUTTONGROUND, Button3, 86, 268}, - {"更多", BUTTONMORE, TRAINING_MORE, ButtonMore, 236, 268}}; + {data->training1_Text, BUTTON1, TRAINING_BUTTONGROUND2, Button1, 86, 118}, + {data->training2_Text, BUTTON2, TRAINING_BOUTTONGROUND, Button2, 236, 118}, + {data->training3_Text, BUTTON3, TRAINING_BOUTTONGROUND, Button3, 86, 268}, + {STR_MORE, BUTTONMORE, TRAINING_MORE, ButtonMore, 236, 268}}; for (auto &buttonInfo : buttons) { @@ -124,10 +113,10 @@ namespace OHOS buttonInfo.button->SetPosition(buttonInfo.posX, buttonInfo.posY); buttonInfo.button->Resize(140, 140); - //WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Id:[%s]", buttonInfo.viewid); - buttonInfo.button->SetText(buttonInfo.text.c_str()); + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Id:[%s]", buttonInfo.viewid); + buttonInfo.button->SetTextId(buttonInfo.textid); buttonInfo.button->SetLabelPosition(0, 70); - buttonInfo.button->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 20); + buttonInfo.button->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 25); buttonInfo.button->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff19ff41, UIButton::PRESSED); buttonInfo.button->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED); buttonInfo.button->SetViewId(buttonInfo.viewid); @@ -143,16 +132,16 @@ namespace OHOS return true; } - + bool Training_CardView::InitImage() { struct ImageInfo { UIImageView *image; - const int imagePath; + const int imagePath; uint16_t posX; uint16_t posY; - const char *viewId; + const char *viewId; }; ImageInfo images[] = { @@ -179,7 +168,7 @@ namespace OHOS return true; } - /* -------------------------------------------------------------------------- */ +/* -------------------------------------------------------------------------- */ bool Training_CardView::InitView() { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Training_CardView::InitView()"); @@ -198,30 +187,30 @@ namespace OHOS // SetCoverable(true); return true; } - + void Training_CardView::DeInit() - { - UIImageView *imageViews[] = {image1, image2, image3}; + { + UIImageView *imageViews[] = {image1, image2, image3}; UIButton *buttons[] = {ButtonMore, Button1, Button3, Button2}; for (auto &imageView : imageViews) { if (imageView != nullptr) - { - delete imageView; + { + delete imageView; imageView = nullptr; - } + } } for (auto &button : buttons) { if (button != nullptr) - { - delete button; + { + delete button; button = nullptr; - } +} } - + if (titleLabel != nullptr) { delete titleLabel; @@ -236,7 +225,7 @@ namespace OHOS InitView(); viewiInitStatus = true; } - // if (!resLoadStatus) + // if (!resLoadStatus) // { // resLoadStatus = true; // } @@ -244,7 +233,7 @@ namespace OHOS void Training_CardView::UnLoad(void) { - // if (resLoadStatus) +// if (resLoadStatus) // { // //ImageCacheManager::GetInstance().UnloadAllInMultiRes(TRAINING_IAMGES); // resLoadStatus = false; diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/maincard/Training.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/maincard/Training.bin index d7b3459af..3fe1da28d 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/maincard/Training.bin and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/maincard/Training.bin differ