From: luozheng <1732036298@qq.com> Date: Sat, 17 Aug 2024 03:35:47 +0000 (+0800) Subject: 指南针界面UI修改与figma统一 X-Git-Tag: release_V1.2.70_20241020_135402~638^2~5^2~4 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=80b74124aeecc825b2904a73547b3a3200b2396a;p=mirrors%2FFD230.git 指南针界面UI修改与figma统一 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassCalibrationView.h b/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassCalibrationView.h index ec186a445..2fde356dc 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassCalibrationView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassCalibrationView.h @@ -1,3 +1,10 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-08-05 15:20:01 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-08-17 11:23:40 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassCalibrationView.h + */ /* * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved. * Description: CompassCalibrationView.h @@ -14,6 +21,7 @@ #include "ohos_types.h" #include "AppGroupView.h" #include "components/ui_image_view.h" +#include "components/ui_scroll_view.h" namespace OHOS { class CompassCalibrationView : public AppGroupView { @@ -25,9 +33,10 @@ public: static CompassCalibrationView *GetInstance(void); bool InitView(void *caller) override; private: - UILabel *labelOne{nullptr}; - UILabel *labelTwo{nullptr}; + UILabelExt *labelOne{nullptr}; + UILabelExt *labelTwo{nullptr}; UIImageView *imageView{nullptr}; + UIScrollView *scrollView{nullptr}; void ClearAll(void); }; diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassCalibrationView.cpp b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassCalibrationView.cpp index b56389fb7..73b44caf9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassCalibrationView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassCalibrationView.cpp @@ -8,6 +8,7 @@ #include "wearable_log.h" #include "compass/include/CompassCalibrationView.h" #include "CompassModel.h" +#include "ui_resource_string.h" namespace OHOS { // 标签设置 @@ -40,17 +41,21 @@ CompassCalibrationView::~CompassCalibrationView() void CompassCalibrationView::ClearAll(void) { RemoveAll(); - if (labelOne != nullptr) { - delete labelOne; - labelOne = nullptr; - } - if (imageView != nullptr) { - delete imageView; - imageView = nullptr; - } - if (labelTwo != nullptr) { - delete labelTwo; - labelTwo = nullptr; + if(scrollView!=nullptr) + { + scrollView->RemoveAll(); + if (labelOne != nullptr) { + delete labelOne; + labelOne = nullptr; + } + if (imageView != nullptr) { + delete imageView; + imageView = nullptr; + } + if (labelTwo != nullptr) { + delete labelTwo; + labelTwo = nullptr; + } } } @@ -62,47 +67,75 @@ CompassCalibrationView *CompassCalibrationView::GetInstance(void) bool CompassCalibrationView::CreateUIViewGroup(void) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CompassCalibrationView::CreateUIViewGroup"); - imageView = new UIImageView(); - if (imageView == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CompassCalibrationView::new UIImageView fail"); - return false; + if (scrollView == nullptr) + { + scrollView = new UIScrollView(); + if (scrollView == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "scrollView new fail"); + return false; + } } - imageView->SetPosition(0, 0); - imageView->SetSrc(COMPASS_CALIBRATE_IMAGE); - - labelOne = new UILabel(); - if (labelOne == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CompassCalibrationView::new labelOne fail"); - ClearAll(); - return false; + scrollView->SetPosition(0, 0, 466, 466); + scrollView->SetScrollBlankSize(50); + scrollView->SetReboundSize(35); + scrollView->SetThrowDrag(true); + scrollView->SetMaxScrollDistance(1000); + scrollView->SetDirection(UIScrollView::VERTICAL); + /* -------------------------------------------------------------------------- */ + if (labelOne == nullptr) + { + labelOne = new UILabelExt(); + if (labelOne == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CompassCalibrationView::new labelOne fail"); + ClearAll(); + return false; + } } - - labelOne->SetPosition(LABEL_POSITION_X, LABEL_POSITION_Y, LABEL_POSITION_WIDTH, LABEL_POSITION_HEIGHT); - labelOne->SetText("请按图示"); - labelOne->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_DEFAULT_SIZE); + labelOne->SetPosition(83, 50,300,35); + labelOne->SetStyle(STYLE_BACKGROUND_OPA, 0xff); + labelOne->SetStyle(STYLE_TEXT_FONT, 30); + labelOne->SetStyle(STYLE_LINE_HEIGHT, 35); + labelOne->SetTextId(STR_CALIBRATE_COMPASS); + labelOne->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); labelOne->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - labelOne->SetStyle(STYLE_TEXT_OPA, OPA_OPAQUE); - labelOne->SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT); - labelOne->SetStyle(STYLE_TEXT_COLOR, Color::White().full); - - labelTwo = new UILabel(); - if (labelTwo == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CompassCalibrationView::new labelTwo fail"); - ClearAll(); - return false; + labelOne->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + /* -------------------------------------------------------------------------- */ + if (imageView == nullptr) { + imageView = new UIImageView(); + if (imageView == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CompassCalibrationView::new UIImageView fail"); + return false; + } } - - labelTwo->SetPosition(LABEL_POSITION_X1, LABEL_POSITION_Y1, LABEL_POSITION_WIDTH1, LABEL_POSITION_HEIGHT1); - labelTwo->SetText("旋转手表进行校准"); - labelTwo->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_DEFAULT_SIZE); + imageView->SetPosition(78, 140,310,120); + imageView->SetSrc(COMPASS_CALIBRATE_IMAGE); + /* -------------------------------- labelTwo -------------------------------- */ + if (labelTwo == nullptr) + { + labelTwo = new UILabelExt(); + if (labelTwo == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CompassCalibrationView::new labelTwo fail"); + ClearAll(); + return false; + } + } + labelTwo->SetPosition(53, 300,360,70); + labelTwo->SetStyle(STYLE_BACKGROUND_OPA, 0xff); + labelTwo->SetStyle(STYLE_TEXT_FONT, 30); + labelTwo->SetStyle(STYLE_LINE_HEIGHT, 35); + labelTwo->SetTextId(STR_CALIBRATE_COMPASS_NOTE); + labelTwo->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); + labelTwo->SetTextColor(Color::GetColorFromRGBA(0xcc, 0xcc, 0xcc, 0xff)); labelTwo->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - labelTwo->SetStyle(STYLE_TEXT_OPA, OPA_OPAQUE); - labelTwo->SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT); - labelTwo->SetStyle(STYLE_TEXT_COLOR, Color::White().full); + labelTwo->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - Add(imageView); - Add(labelOne); - Add(labelTwo); + scrollView->Add(imageView); + scrollView->Add(labelOne); + scrollView->Add(labelTwo); + Add(scrollView); SetDraggable(false); SetTouchable(false); initViewStatus = true; diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/COMPASS_CALIBRATE_IMAGE.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/COMPASS_CALIBRATE_IMAGE.bin index 904b43910..796b2a4ed 100644 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/COMPASS_CALIBRATE_IMAGE.bin +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/COMPASS_CALIBRATE_IMAGE.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0020e98c767d12c1187a317d05daefee5d77cbb752b25b31f46a775289f64867 -size 138648 +oid sha256:f7b77a04c4dd10dcc17a05161fe33e4bd0b2c941a8a36c961846be3488085fc2 +size 24984