From 8b20ce8985c532fb57893e1d5e80a2a1cc5e9cad Mon Sep 17 00:00:00 2001 From: Caisking Date: Fri, 9 May 2025 14:52:11 +0800 Subject: [PATCH] =?utf8?q?=E5=B1=8F=E5=B9=95=E4=B8=8E=E4=BA=AE=E5=BA=A6=20?= =?utf8?q?=E9=80=80=E5=87=BA=E6=AD=BB=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../src/BrightnessLevelView.cpp | 9 +++ .../src/BrightnessControlView.cpp | 15 ++++ .../src/DisplayBrightnessPresent.cpp | 6 +- .../src/DisplayBrightnessView.cpp | 71 ++++++++++++------- .../src/ScreenDurationView.cpp | 5 ++ 5 files changed, 76 insertions(+), 30 deletions(-) diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/brightnesslevel/src/BrightnessLevelView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/brightnesslevel/src/BrightnessLevelView.cpp index d569c7366..71d08a097 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/brightnesslevel/src/BrightnessLevelView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/brightnesslevel/src/BrightnessLevelView.cpp @@ -23,6 +23,7 @@ namespace OHOS BrightnessLevelView::~BrightnessLevelView() { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BrightnessLevelView::~BrightnessLevelView"); + ClearAll(); g_pBrightnessLevelView = nullptr; } @@ -35,6 +36,7 @@ namespace OHOS { if (p_BrightnessControlView != nullptr) { + // delete scorllView; scorllView = nullptr; delete p_BrightnessControlView; @@ -50,12 +52,19 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[BrightnessLevelView::BrightnessLevelViewInit] p_BrightnessControlView is nullptr!!"); return; } + scorllView = p_BrightnessControlView->BrightnessControlViewInit(); + + if (scorllView == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[BrightnessLevelView::BrightnessLevelViewInit] scorllView == nullptr"); return; } + + scorllView->SetDraggable(true); + scorllView->SetTouchable(true); + scorllView->SetOnDragListener(presenter_); } void BrightnessLevelView::OnStart() diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/BrightnessControlView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/BrightnessControlView.cpp index da7923cd4..4cf3adebe 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/BrightnessControlView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/BrightnessControlView.cpp @@ -32,6 +32,8 @@ namespace OHOS { if (initViewStatus == true) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BrightnessControlView::ClearAll"); + BrightnessControlScrollView->RemoveAll(); delete BrightnessControlViewSlider; @@ -45,6 +47,8 @@ namespace OHOS delete BrightnessControlScrollView; BrightnessControlScrollView = nullptr; + + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BrightnessControlView::ClearAll end"); } } @@ -164,6 +168,11 @@ namespace OHOS public: void ApplyChange(BrightnessControlView *view, UISlider *slider, uint8_t value) override { + if( slider == nullptr ) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ApplyChange: slider is nullptr!"); + return; + } // Implement the logic similar to the BRIGHTNESSLOWERS case uint8_t newBrightnessValue = slider->GetValue() - BRIGHTNESS_CHANGE; if (newBrightnessValue < BRIGHTNESS_MIN) @@ -189,6 +198,12 @@ namespace OHOS void ApplyChange(BrightnessControlView *view, UISlider *slider, uint8_t value) override { // Implement the logic similar to the BRIGHTNESSEVATED case + if( slider == nullptr ) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ApplyChange: slider is nullptr!"); + return; + } + uint8_t newBrightnessValue = slider->GetValue() + BRIGHTNESS_CHANGE; if (newBrightnessValue > BRIGHTNESS_MAX) { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp index 0aba5f4ca..99a286d40 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp @@ -164,7 +164,7 @@ namespace OHOS bool DisplayBrightnessPresenter::OnClick(UIView &view, const ClickEvent &event) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessPresenter::OnClick"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessPresenter::OnClick"); DisplayBrightnessView *p_DisplayBrightnessView = DisplayBrightnessView::GetInstance(); if (p_DisplayBrightnessView == nullptr) { @@ -188,7 +188,7 @@ namespace OHOS bool DisplayBrightnessPresenter::OnDrag(UIView &view, const DragEvent &event) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessPresenter::OnDrag"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessPresenter::OnDrag"); UNUSED(view); if ((event.GetDeltaX() > X_DRAG_OFFSET) && (event.GetDeltaX() > (DOUBLES * MATH_ABS(event.GetDeltaY())))) // 拖动过程中判断是否是水平滑动 { @@ -199,7 +199,7 @@ namespace OHOS bool DisplayBrightnessPresenter::OnDragEnd(UIView &view, const DragEvent &event) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessPresenter::OnDragEnd"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessPresenter::OnDragEnd"); DisplayBrightnessView *p_DisplayBrightnessView = DisplayBrightnessView::GetInstance(); if (p_DisplayBrightnessView == nullptr) { diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/DisplayBrightnessView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/DisplayBrightnessView.cpp index b62557f8c..41ed8be71 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/DisplayBrightnessView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/DisplayBrightnessView.cpp @@ -33,43 +33,51 @@ namespace OHOS { if (initViewStatus == true) { - DisplayBrightnessScrollView[DISPLAYBRIGHTNESSVIEW]->RemoveAll(); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessView::ClearAll"); - delete DisplayBrightnessTitleLabel; - DisplayBrightnessTitleLabel = nullptr; + if(DisplayBrightnessScrollView[DISPLAYBRIGHTNESSVIEW] != nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessView::ClearAll DisplayBrightnessScrollView[DISPLAYBRIGHTNESSVIEW]"); - delete BringhtnessControlButton; - BringhtnessControlButton = nullptr; + DisplayBrightnessScrollView[DISPLAYBRIGHTNESSVIEW]->RemoveAll(); - delete ScreenDurationButton; - ScreenDurationButton = nullptr; + delete DisplayBrightnessTitleLabel; + DisplayBrightnessTitleLabel = nullptr; - delete BringhtnessControlLabel; - BringhtnessControlLabel = nullptr; + delete BringhtnessControlButton; + BringhtnessControlButton = nullptr; - delete ScreenDurationLabel; - ScreenDurationLabel = nullptr; + delete ScreenDurationButton; + ScreenDurationButton = nullptr; - delete selectScreenDurationLabel; - selectScreenDurationLabel = nullptr; + delete BringhtnessControlLabel; + BringhtnessControlLabel = nullptr; - delete RaiseToBrightnessLabel; - RaiseToBrightnessLabel = nullptr; + delete ScreenDurationLabel; + ScreenDurationLabel = nullptr; - for (int i = 0; i < 2; i++) - { - delete NextImage[i]; - NextImage[i] = nullptr; - } + delete selectScreenDurationLabel; + selectScreenDurationLabel = nullptr; + + delete RaiseToBrightnessLabel; + RaiseToBrightnessLabel = nullptr; + + for (int i = 0; i < 2; i++) + { + delete NextImage[i]; + NextImage[i] = nullptr; + } - delete RaiseToBrightnessImage; - RaiseToBrightnessImage = nullptr; + delete RaiseToBrightnessImage; + RaiseToBrightnessImage = nullptr; - delete RaiseToBrightnessCheckBoxButton; - RaiseToBrightnessCheckBoxButton = nullptr; + delete RaiseToBrightnessCheckBoxButton; + RaiseToBrightnessCheckBoxButton = nullptr; - delete DisplayBrightnessScrollView[DISPLAYBRIGHTNESSVIEW]; - DisplayBrightnessScrollView[DISPLAYBRIGHTNESSVIEW] = nullptr; + delete DisplayBrightnessScrollView[DISPLAYBRIGHTNESSVIEW]; + DisplayBrightnessScrollView[DISPLAYBRIGHTNESSVIEW] = nullptr; + + } } if (p_ScreenDurationView != nullptr) { @@ -80,6 +88,9 @@ namespace OHOS { DisplayBrightnessScrollView[i] = nullptr; } + + initViewStatus = false; + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessView::ClearAll end"); } // 显示与亮度视图scrollView初始化 @@ -383,7 +394,7 @@ namespace OHOS initViewStatus = true; } RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::DisplayBrightnessPresenter::GetInstance(); - RootView::GetInstance()->SetOnKeyActListener(keyactListener); + RootView::GetInstance()->SetOnKeyActListener(keyactListener); if (DisplayBrightnessScrollView[DISPLAYBRIGHTNESSVIEW] == nullptr) { @@ -502,6 +513,12 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessView:: SystemViewId Overstep ones bounds"); return; } + + if( DisplayBrightnessScrollView[hideView] == nullptr || DisplayBrightnessScrollView[showView] == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessView:: DisplayBrightnessScrollView is nullptr"); + } + DisplayBrightnessScrollView[hideView]->SetVisible(false); ClickFunc(showView); DisplayBrightnessScrollView[showView]->SetVisible(true); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/ScreenDurationView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/ScreenDurationView.cpp index 165721e39..3507fc935 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/ScreenDurationView.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/displaybrightness/src/ScreenDurationView.cpp @@ -31,8 +31,11 @@ namespace OHOS { if (initViewStatus == true) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScreenDurationView ClearAll"); + if (ScreenDurationScrollView != nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScreenDurationView ClearAll start"); ScreenDurationScrollView->RemoveAll(); if (ScreenDurationTitleLabel != nullptr) { @@ -70,6 +73,8 @@ namespace OHOS delete ScreenDurationScrollView; ScreenDurationScrollView = nullptr; } + + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScreenDurationView ClearAll end"); } } -- 2.17.1