From: Caisking <3449750381@qq.com> Date: Thu, 21 Mar 2024 13:16:37 +0000 (+0800) Subject: 切换表盘增加光晕效果 X-Git-Tag: release_V1.2.70_20241020_135402~1279 X-Git-Url: http://git.snicker.com.cn/img/static/gitweb.css?a=commitdiff_plain;h=d9f046fcb9a74c0784ee9157dbf163115348fd7d;p=mirrors%2FFD230.git 切换表盘增加光晕效果 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistView.cpp b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistView.cpp index 38cbe7ff9..b42eb6140 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistView.cpp @@ -137,8 +137,6 @@ namespace OHOS contentList_->SetScrollStateListener(this); contentList_->SetMaxScrollDistance(MAX_SCROLL_DIS); contentList_->SetYScrollBarVisible(true); - // contentList_->EnableAutoAlign(true); - // contentList_->SetAutoAlignTime(100); SetContainerView(contentList_); dragListener = new AppListOnDragListener(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/dialupdate/src/DialUpdateView.cpp b/code/sdk/application/wearable/fd230app/nativeui/dialupdate/src/DialUpdateView.cpp index 2ba4f1c79..1e6a6d566 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/dialupdate/src/DialUpdateView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/dialupdate/src/DialUpdateView.cpp @@ -15,8 +15,12 @@ #include "dialupdate/include/DialUpdateView.h" #include "dialupdate/include/DialUpdateModel.h" +#include +#include "common/image_cache_manager.h" +#include "gfx_utils/mem_api.h" #include "wearable_log.h" #include +#include "components/ui_canvas_ext.h" extern DialInfo dialInfo[MAX_DIALNUM]; extern DialInfo_1 dialInfo_1[MAX_DIALNUM_1]; @@ -29,7 +33,10 @@ namespace OHOS { g_pDialUpdateView = this; } + UICardPage *Page[10] = {NULL}; UILabelButtonExt *Button[10] = {NULL}; + UILabel *Label[10] = {NULL}; + UICanvasExt *canvas[10] = {NULL}; DialUpdateView::~DialUpdateView() { if (container_ != nullptr) @@ -41,11 +48,27 @@ namespace OHOS for (int i = 0; i < dial_num; i++) { + if (Page[i] != nullptr) + { + Page[i]->RemoveAll(); + delete Page[i]; + Page[i] = nullptr; + } + if (Label[i] != NULL) + { + delete Label[i]; + Label[i] = NULL; + } if (Button[i] != NULL) { delete Button[i]; Button[i] = NULL; } + if (canvas[i] != NULL) + { + delete canvas[i]; + canvas[i] = NULL; + } } g_pDialUpdateView = nullptr; } @@ -79,31 +102,67 @@ namespace OHOS { for (int i = 0; i < dial_num; i++) { + Page[i] = new UICardPage(); + if (Page == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Page new fail!"); + } + Page[i]->SetPosition(0, 0, 466, 466); + Page[i]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); + + /* --------------------------------- 增加光晕效果 --------------------------------- */ + canvas[i] = new UICanvasExt(); + if (canvas[i] == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "canvas new fail!"); + } + canvas[i]->SetPosition(73, 73, 320, 320); + canvas[i]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); + canvas[i]->SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE); + PaintExt paint; + Point center = {158, 158}; + paint.SetStyle(Paint::PaintStyle::STROKE_STYLE); + paint.SetStrokeWidth(20); // 30: stroke width + paint.SetStrokeColor(Color::Cyan()); + paint.SetAntialiased(true); + RadialGradient radial = {158, 158, 150, 150, 152}; + ColorStop stops[3] = {{0, Color::White().full}, {0.8, Color::White().full}, {1, 0x00ffffff}}; + paint.SetRadialGradient(radial, stops, 3); // 3: count + canvas[i]->DrawCircle(center, 140, paint); + Page[i]->Add(canvas[i]); + /* -------------------------------------------------------------------------- */ + Label[i] = new UILabel(); + if (Label[i] == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Label new fail!"); + } + Label[i]->SetPosition(115, 40, 200, 60); + Label[i]->SetText(dialInfo_1[i].title); + Label[i]->SetAlign(TEXT_ALIGNMENT_CENTER); + Label[i]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + Page[i]->Add(Label[i]); + Button[i] = new UILabelButtonExt(); - if (Button == nullptr) + if (Button[i] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemView::SystemUpgradeButtonExt new fail!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Button new fail!"); } - Button[i]->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetWidth()); + Button[i]->SetPosition(103, 103, 260, 260); Button[i]->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); - Button[i]->SetImagePosition(103, 103); + Button[i]->SetImagePosition(0, 0); Button[i]->SetViewId(dialInfo_1[i].title); - Button[i]->SetImageSrc(dialInfo_1[i].thumbnailPath, dialInfo_1[i].thumbnailPath); - Button[i]->SetText(dialInfo_1[i].title); - Button[i]->SetAlign(TEXT_ALIGNMENT_CENTER); - Button[i]->SetLabelPosition(0, -380); - Button[i]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); Button[i]->SetStyleForState(STYLE_BORDER_COLOR, Color::Black().full, UIButton::PRESSED); Button[i]->SetStyleForState(STYLE_BACKGROUND_COLOR, Color::Black().full, UIButton::PRESSED); UIView::OnClickListener *buttonClick = static_cast(DialUpdatePresenter::GetInstance()); UIView::OnDragListener *buttondarg = static_cast(DialUpdatePresenter::GetInstance()); Button[i]->SetOnClickListener(buttonClick); Button[i]->SetOnDragListener(buttondarg); - container_->Add(Button[i]); + Page[i]->Add(Button[i]); + + container_->Add(Page[i]); } } - UICardPage *cade[10] = {nullptr}; void DialUpdateView::OnStart() { 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 017fbbf0e..e7306fa54 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp @@ -54,7 +54,7 @@ namespace OHOS UNUSED(view); if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) { - NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); + NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST, TRANSITION_ZOOM); } return true; } 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 875792e68..dd97ffbbb 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp @@ -229,12 +229,14 @@ namespace OHOS void TraingView::OnStart() { +#if 0 printf(" data--training1_Text: %s\n", data->training1_Text.c_str()); printf(" data--training1_Image: %s\n", data->training1_Image.c_str()); printf(" data--training2_Text: %s\n", data->training2_Text.c_str()); printf(" data--training2_Image: %s\n", data->training2_Image.c_str()); printf(" data--training3_Text: %s\n", data->training3_Text.c_str()); printf(" data--training3_Image: %s\n", data->training3_Image.c_str()); +#endif container_ = new UIViewGroup(); if (container_ == nullptr) { @@ -258,6 +260,7 @@ namespace OHOS GetView(); RootView::GetInstance()->Add(container_); + SetContainerView(container_); } void TraingView::OnSetUpView() diff --git a/code/sdk/middleware/services/gui/uikit/utils/interfaces/innerkits/graphic_config.h b/code/sdk/middleware/services/gui/uikit/utils/interfaces/innerkits/graphic_config.h index 587812931..fd6764235 100755 --- a/code/sdk/middleware/services/gui/uikit/utils/interfaces/innerkits/graphic_config.h +++ b/code/sdk/middleware/services/gui/uikit/utils/interfaces/innerkits/graphic_config.h @@ -361,7 +361,7 @@ namespace OHOS { /** * @brief Graphics rendering accelerated by VGUEngine, which is disabled by default on other platforms. */ -#define ENABLE_VGU_ENGINE 0 +#define ENABLE_VGU_ENGINE 1 /** * @brief ARM NEON ability, which is enabled by default on other platforms. */