From: luozheng <1732036298@qq.com> Date: Thu, 27 Jun 2024 03:31:36 +0000 (+0800) Subject: 指南针界面优化 X-Git-Tag: release_V1.2.70_20241020_135402~928^2~11 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=f4c9ba05dc23d75586301c6f06227afb57e1bcf0;p=mirrors%2FFD230.git 指南针界面优化 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassView.h b/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassView.h index b05ce5f69..877572f3e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassView.h @@ -1,8 +1,9 @@ /* - * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. - * Description: CompassView.h - * Author: - * Create: 2021-12-21 + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-06-12 11:44:04 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-06-27 09:51:49 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassView.h */ #ifndef COMPASS_VIEW_H @@ -33,6 +34,11 @@ public: bool InitView(void *caller) override; bool GetInitViewState(void); bool InitCompassImage(void); + + bool GetResLoadStatus(void); + void SetResLoadStatus(bool state); + void PreLoadCompassImageRes(void); + void UnLoadCompassImageRes(void); private: bool LoadCompassImage(UIImageView *view, uint32_t resId); void ClearAll(void); @@ -42,6 +48,7 @@ private: UIImageView *PlaceMarkerImage{nullptr}; //放置标记图片 UIImageView *triangulation{nullptr}; //三角图片 const Vector2 VIEW_CENTER = {VIEW_CENTERS, VIEW_CENTERS};//二维向量 + bool resLoadStatus{false}; }; } #endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassPresenter.h index 4123c1d5d..efa623f11 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassPresenter.h @@ -2,9 +2,8 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-06-07 09:21:47 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-06-07 20:18:32 + * @LastEditTime: 2024-06-27 09:42:42 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassPresenter.h - * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ #ifndef COMPASS_MAINPRESENTER_H #define COMPASS_MAINPRESENTER_H @@ -16,10 +15,10 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" #include"language/font/ui_resource_string.h" -#include "CompassView.h" -#include "CompassPresenter.h" -#include "CompassModel.h" -#include "CompassCalibrationView.h" +#include "compass/include/CompassView.h" +#include "compass/include/CompassPresenter.h" +#include "compass/include/CompassModel.h" +#include "compass/include/CompassCalibrationView.h" #include "KeyInputListener.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassView.h b/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassView.h index 4a3c1800f..d6c575f8e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassView.h @@ -1,8 +1,10 @@ /* - * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. - * Description: MainCompassView - * Author: - * Create: 2021-12-23 + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-03-30 09:14:38 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-06-27 10:57:00 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassView.h + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ #ifndef MAIN_COMPASS_VIEW_H @@ -19,9 +21,9 @@ #include "components/ui_label_button.h" #include "ChangeSliceListener.h" #include "graphic_config.h" -#include "CompassView.h" -#include "CompassModel.h" -#include "CompassCalibrationView.h" +#include "compass/include/CompassView.h" +#include "compass/include/CompassModel.h" +#include "compass/include/CompassCalibrationView.h" namespace OHOS { class MainCompassPresenter; @@ -41,6 +43,7 @@ public: void SetDisplayFalse(void); private: + void ClearAll(); CompassView *compassView{nullptr}; CompassCalibrationView *compassCalibrationView{nullptr}; }; 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 568a6558b..b56389fb7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassCalibrationView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassCalibrationView.cpp @@ -6,7 +6,7 @@ */ #include "UiConfig.h" #include "wearable_log.h" -#include "CompassCalibrationView.h" +#include "compass/include/CompassCalibrationView.h" #include "CompassModel.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassControlView.cpp index 3121836ba..8e0174a51 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassControlView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassControlView.cpp @@ -1,11 +1,12 @@ /* - * Copyright (c) CompanyNameMagicTag 2022-2022. All rights reserved. - * Description: CompassControlView.cpp - * Author: - * Create: 2022-04-02 + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-06-12 11:44:23 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-06-27 10:48:45 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassControlView.cpp */ -#include "CompassControlView.h" -#include "CompassModel.h" +#include "compass/include/CompassControlView.h" +#include "compass/include/CompassModel.h" #include "wearable_log.h" namespace OHOS { @@ -86,14 +87,23 @@ void CompassControlView::SetCalibrationView(bool flag) void CompassControlView::PreLoad(void) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CompassControlView::PreLoad"); if (!viewiInitStatus) { InitView(); viewiInitStatus = true; } + if( compassView != nullptr) + { + compassView->PreLoadCompassImageRes(); + } } void CompassControlView::UnLoad(void) { - // Compass's usage scenes is complicated, so we do not release it's resources inner slice. + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CompassControlView::UnLoad"); + if( compassView != nullptr) + { + compassView->UnLoadCompassImageRes(); + } } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassModel.cpp index 41e854172..f4ab07402 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassModel.cpp @@ -6,7 +6,7 @@ */ #include -#include "CompassModel.h" +#include "compass/include/CompassModel.h" #include #ifdef __cplusplus diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassPresenter.cpp index b225fa967..73a8d76df 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassPresenter.cpp @@ -4,9 +4,9 @@ * Author: * Create: 2021-12-21 */ -#include "CompassView.h" -#include "CompassPresenter.h" -#include "CompassModel.h" +#include "compass/include/CompassView.h" +#include "compass/include/CompassPresenter.h" +#include "compass/include/CompassModel.h" #include "graphic_service.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassView.cpp b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassView.cpp index 5da5dd268..b8f32b702 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/compass/src/CompassView.cpp @@ -7,26 +7,31 @@ #include #include "common/image_cache_manager.h" #include "ui_resource_image.h" -#include "CompassView.h" -#include "MainCompassView.h" -#include "CompassPresenter.h" +#include "compass/include/CompassView.h" +#include "compass/include/MainCompassView.h" +#include "compass/include/CompassPresenter.h" namespace OHOS { +static constexpr int16_t COMPASSVIEW_W = 466; +static constexpr int16_t COMPASSVIEW_H = 466; static constexpr int16_t POINT_CENTER_IMAGE_X = 192; static constexpr int16_t POINT_CENTER_IMAGE_Y = 282; static constexpr int16_t TRIANGULATION_X = 221; static constexpr int16_t TRIANGULATION_Y = 0; -static constexpr int16_t DIRECTIONLABEL_X = 198; -static constexpr int16_t DIRECTIONLABEL_Y = 131; -static constexpr int16_t DIRECTIONLABEL_TEXT_WIDTH = 70; -static constexpr int16_t DIRECTIONLABEL_TEXT_HEIGH = 42; -static constexpr int16_t DIRECTIONLABEL_FONT_TEXT_SIZE = 35; -static constexpr int16_t DIRECTIONLABEL_STYLE_LINE_HEIGHT = 42; + +static constexpr int16_t DIRECTIONLABEL_X = 168; +static constexpr int16_t DIRECTIONLABEL_Y = 161; +static constexpr int16_t DIRECTIONLABEL_TEXT_WIDTH = 130; +static constexpr int16_t DIRECTIONLABEL_TEXT_HEIGH = 76; +static constexpr int16_t DIRECTIONLABEL_FONT_TEXT_SIZE = 65; +static constexpr int16_t DIRECTIONLABEL_STYLE_LINE_HEIGHT = 76; + static constexpr int16_t ANGLEDLABEL_X = 136; -static constexpr int16_t ANGLEDLABEL_Y = 182; +static constexpr int16_t ANGLEDLABEL_Y = 240; static constexpr int16_t ANGLEDLABEL_TEXT_WIDTH = 194; static constexpr int16_t ANGLEDLABEL_TEXT_HEIGHT = 94; static constexpr int16_t ANGLEDLABEL_FONT_TEXT_SIZE = 80; static constexpr int16_t ANGLEDLABEL_STYLE_LINE_HEIGHT = 94; + static constexpr int16_t RANDOM_NUMBER_720 = 720; static constexpr int16_t RANDOM_NUMBER_360 = 360; static constexpr int16_t DELAYING_NUMS = 2000; @@ -35,7 +40,7 @@ static CompassView *g_pCompassView = nullptr; CompassView::CompassView() { - SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); + SetPosition(0, 0, COMPASSVIEW_W, COMPASSVIEW_H); g_pCompassView = this; } @@ -49,6 +54,7 @@ CompassView::~CompassView() void CompassView::ClearAll(void) { RemoveAll(); + UnLoadCompassImageRes(); if (directionLabel != nullptr) { delete directionLabel; directionLabel= nullptr; @@ -90,6 +96,44 @@ bool CompassView::LoadCompassImage(UIImageView *view, uint32_t resId) view->SetSrc(image); return true; } +bool CompassView::GetResLoadStatus(void) +{ + return resLoadStatus; +} +void CompassView::SetResLoadStatus(bool state) +{ + resLoadStatus = state; +} +void CompassView::PreLoadCompassImageRes(void) +{ + if(!GetResLoadStatus()){ + if (LoadCompassImage(backGround, COMPASS_COMPASS0) == false) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d], triangulation load fail", __LINE__); + return; + } + if (LoadCompassImage(PlaceMarkerImage, COMPASS_COMPASS1) == false) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[%d], PlaceMarkerImage load fail", __LINE__); + return; + } + if (LoadCompassImage(triangulation, COMPASS_COMPASS2) == false) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "triangulation load fail"); + return ; + } + SetResLoadStatus(true); + } +} +void CompassView::UnLoadCompassImageRes(void) +{ + if(GetResLoadStatus()) + { + ImageInfo* image = nullptr; + backGround->SetSrc(image); + PlaceMarkerImage->SetSrc(image); + triangulation->SetSrc(image); + ImageCacheManager::GetInstance().UnloadAllInMultiRes(COMPASS_IAMGES); + SetResLoadStatus(false); + } +} //初始化指南针图片 bool CompassView::InitCompassImage(void) { @@ -126,6 +170,9 @@ bool CompassView::InitCompassImage(void) WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "triangulation load fail"); return false; } + + SetResLoadStatus(true); + return true; } //初始化页面 @@ -149,11 +196,12 @@ bool CompassView::InitPage(void) directionLabel->SetStyle(STYLE_TEXT_FONT, DIRECTIONLABEL_FONT_TEXT_SIZE); directionLabel->SetStyle(STYLE_LINE_HEIGHT, DIRECTIONLABEL_STYLE_LINE_HEIGHT); directionLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, DIRECTIONLABEL_FONT_TEXT_SIZE); - directionLabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); + directionLabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); + directionLabel->SetTextColor(Color::GetColorFromRGBA(0xff, 0x5a, 0x36, 0xff)); directionLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - directionLabel->SetStyle(STYLE_TEXT_OPA, OPA_OPAQUE); - directionLabel->SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT); - directionLabel->SetStyle(STYLE_TEXT_COLOR, Color::White().full); + // directionLabel->SetStyle(STYLE_TEXT_OPA, OPA_OPAQUE); + // directionLabel->SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT); + // directionLabel->SetStyle(STYLE_TEXT_COLOR, Color::White().full); angledLabel = new UILabel(); if (angledLabel == nullptr) { @@ -174,7 +222,7 @@ bool CompassView::InitPage(void) angledLabel->SetStyle(STYLE_TEXT_COLOR, Color::White().full); Add(backGround); - Add(PlaceMarkerImage); + //Add(PlaceMarkerImage); Add(triangulation); Add(directionLabel); Add(angledLabel); diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/src/MainCompassPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/compass/src/MainCompassPresenter.cpp index c4ecc3724..a8ed9d59c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/compass/src/MainCompassPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/compass/src/MainCompassPresenter.cpp @@ -2,14 +2,13 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-14 15:02:03 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-06-13 15:22:10 + * @LastEditTime: 2024-06-27 09:37:31 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/compass/src/MainCompassPresenter.cpp - * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ -#include "CompassView.h" -#include "MainCompassPresenter.h" -#include "MainCompassView.h" +#include "compass/include/CompassView.h" +#include "compass/include/MainCompassPresenter.h" +#include "compass/include/MainCompassView.h" #include "wearable_log.h" #include "common/key_code.h" #include "custom_utils.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/src/MainCompassView.cpp b/code/sdk/application/wearable/fd230app/nativeui/compass/src/MainCompassView.cpp index e240a47ce..a3dd2778b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/compass/src/MainCompassView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/compass/src/MainCompassView.cpp @@ -1,12 +1,13 @@ /* - * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. - * Description: MainCompassView.cpp - * Author: - * Create: 2021-12-23 + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-01-29 15:37:44 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-06-27 11:06:05 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/compass/src/MainCompassView.cpp */ -#include "MainCompassView.h" -#include "MainCompassPresenter.h" +#include "compass/include/MainCompassView.h" +#include "compass/include/MainCompassPresenter.h" namespace OHOS { static constexpr int16_t TWO_HOUR_SECOND = 7200; @@ -20,12 +21,6 @@ MainCompassView::MainCompassView() MainCompassView::~MainCompassView() { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainCompassView::~MainCompassView"); - RootView::GetInstance()->Remove(compassView); - RootView::GetInstance()->Remove(compassCalibrationView); - delete compassView; - compassView = nullptr; - delete compassCalibrationView; - compassCalibrationView = nullptr; g_pMainCompassView = nullptr; } @@ -34,6 +29,24 @@ MainCompassView *MainCompassView::GetInstance() return g_pMainCompassView; } +void MainCompassView::ClearAll() +{ + if (container_ != nullptr) + { + RootView::GetInstance()->Remove(compassView); + RootView::GetInstance()->Remove(compassCalibrationView); + + delete compassView; + compassView = nullptr; + + delete compassCalibrationView; + compassCalibrationView = nullptr; + + delete container_; + container_ = nullptr; + } +} + void MainCompassView::SetDisplayTure() { if (compassView == nullptr || compassCalibrationView == nullptr) { @@ -57,7 +70,14 @@ void MainCompassView::SetDisplayFalse() void MainCompassView::OnStart() { View::OnStart(); - BaseView::RootView(Color::Black().full); + SetContainerView(new UIViewGroup()); + if(container_ == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "container_ is nullptr!!"); + return ; + } + container_->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); + container_->SetStyle(STYLE_BACKGROUND_COLOR,Color::Black().full); compassCalibrationView = new CompassCalibrationView(); if (compassCalibrationView == nullptr) { @@ -88,8 +108,8 @@ void MainCompassView::OnStart() compassCalibrationView->SetOnDragListener(compassCalibrationDragListener); compassCalibrationView->InitView(this); - RootView::GetInstance()->Add(compassView); - RootView::GetInstance()->Add(compassCalibrationView); + container_->Add(compassView); + container_->Add(compassCalibrationView); time_t currTime = CompassModel::GetInstance()->GetCurrentTime(); time_t lastTime = CompassModel::GetInstance()->GetLastTime(); @@ -127,13 +147,8 @@ void MainCompassView::OnTearDownView() void MainCompassView::OnStop() { View::OnStop(); - if (container_ != nullptr) { - container_->RemoveAll(); - delete container_; - container_ = nullptr; - } RootView::GetInstance()->ClearOnKeyActListener(); - RootView::GetInstance()->RemoveAll(); + ClearAll(); CompassModel::GetInstance()->CloseCompassSensor(); return; }