From: luozheng <1732036298@qq.com> Date: Tue, 16 Apr 2024 09:39:19 +0000 (+0800) Subject: 将亮度调节修改为slice并添加到applist上 X-Git-Tag: release_V1.2.70_20241020_135402~1185^2~3 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=refs%2Fchanges%2F14%2Fhead;p=mirrors%2FFD230.git 将亮度调节修改为slice并添加到applist上 --- diff --git a/code/sdk/application/wearable/fd230app/CMakeLists.txt b/code/sdk/application/wearable/fd230app/CMakeLists.txt index ea78e830a..296af741f 100644 --- a/code/sdk/application/wearable/fd230app/CMakeLists.txt +++ b/code/sdk/application/wearable/fd230app/CMakeLists.txt @@ -325,6 +325,9 @@ set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/findphone/src/FindPhoneView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/findphone/src/FindPhoneModel.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/brightnesslevel/src/BrightnessLevelPresenter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/brightnesslevel/src/BrightnessLevelView.cpp + #天气 ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/weather/src/MainWeatherPresenter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/weather/src/MainWeatherView.cpp diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h index 7643650d3..2b15b1143 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h +++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h @@ -57,7 +57,8 @@ typedef enum : uint16_t VIEW_MAIN_STOPWATCH, // 秒表 VIEW_MAIN_COUNTDOWN, // 计时器 VIEW_DNOTDISTURB, // 勿扰模式 - VIEW_FLASHLIGHT, // 手电筒 + VIEW_FLASHLIGHT, // 手电筒 + VIEW_BRIGHTNESSLEVEL, // 亮度调节 /* ----------------------------------- 录音 ----------------------------------- */ VIEW_RECORD, /* ---------------------------------- 界面 ---------------------------------- */ diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h index 57e306bad..9acbadc10 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h +++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h @@ -53,6 +53,7 @@ namespace OHOS void InitMainCountDownSlice(void); void InitDnotDisturbSlice(void); void InitFlashlightSlice(void); + void InitBrightnessLevelSlice(void); /* --------------------------------界面------------------------------------ */ void InitRotateSlice(void); void InitBloodSlice(void); diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h index e04af26e5..750d9a1cf 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h +++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h @@ -261,6 +261,7 @@ namespace OHOS static constexpr const char *PNG_APPLIST_FINDPHONE_IMAGE = APP_LIST_PATH "/findphone.bin"; // 查找手机 static constexpr const char *PNG_APPLIST_DISTURB_IMAGE = APP_LIST_PATH "/disturb.bin"; // 勿扰模式 static constexpr const char *PNG_APPLIST_FLASHLIGHT_IMAGE = APP_LIST_PATH "/flashlight.bin"; // 手电筒 + static constexpr const char *PNG_APPLIST_BRIGHTNESSLEVEL_IMAGE = APP_LIST_PATH "/lighting.bin"; // 亮度调节 /* ---------------------------------- 快速训练 ---------------------------------- */ static constexpr const char *PNG_TRAING_BOUTTONMORE_IMAGE = APP_RES_PATH "/Training/More.bin"; static constexpr const char *PNG_TRAING_BUTTONGRONG_IMAGE = APP_RES_PATH "/Training/Bouttonground.bin"; diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp index 7b242dafa..06c335005 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp +++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp @@ -153,6 +153,9 @@ #include "flashlight/include/FlashlightPresenter.h" #include "flashlight/include/FlashlightView.h" + +#include "brightnesslevel/include/BrightnessLevelPresenter.h" +#include "brightnesslevel/include/BrightnessLevelView.h" /* -------------------------------------------------------------------------- */ #include "traing/include/TraingView.h" #include "traing/include/TraingPresenter.h" @@ -273,6 +276,7 @@ namespace OHOS {VIEW_MAIN_COUNTDOWN, &NativeLauncher::InitMainCountDownSlice}, {VIEW_DNOTDISTURB, &NativeLauncher::InitDnotDisturbSlice}, {VIEW_FLASHLIGHT, &NativeLauncher::InitFlashlightSlice}, + {VIEW_BRIGHTNESSLEVEL, &NativeLauncher::InitBrightnessLevelSlice}, {VIEW_MESSAGE, &NativeLauncher::InitMessageSlice}, @@ -1113,6 +1117,18 @@ namespace OHOS NativeAbility::GetInstance().AddSliceProxy(VIEW_FLASHLIGHT, flashlight); } + /*手电筒*/ + void NativeLauncher::InitBrightnessLevelSlice(void) + { + SliceProxy *brightnesslevel = new AbilitySliceProxy; + if (brightnesslevel == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "brightnesslevel"); + return; + } + NativeAbility::GetInstance().AddSliceProxy(VIEW_BRIGHTNESSLEVEL, brightnesslevel); + } + /* -------------------------------------------------------------------------- */ void NativeLauncher::InitSetDesktopSlice(void) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp index 68c35ae25..46e9c2e7e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp @@ -43,6 +43,7 @@ namespace OHOS {VIEW_SET_DIAL, PNG_APPLIST_CHANGEDIAL_IMAGE, PNG_APPLIST_CHANGEDIAL_IMAGE, "切换表盘", nullptr}, {VIEW_DNOTDISTURB, PNG_APPLIST_DISTURB_IMAGE, PNG_APPLIST_DISTURB_IMAGE, "勿扰模式", nullptr}, {VIEW_FLASHLIGHT, PNG_APPLIST_FLASHLIGHT_IMAGE, PNG_APPLIST_FLASHLIGHT_IMAGE, "手电筒", nullptr}, + {VIEW_BRIGHTNESSLEVEL, PNG_APPLIST_BRIGHTNESSLEVEL_IMAGE, PNG_APPLIST_BRIGHTNESSLEVEL_IMAGE, "亮度调节", nullptr}, #ifdef SUPPORT_ALIPAY_SEC {VIEW_MAIN_ALIPAY, PNG_APPLIST_ALIPAY_IMAGE, PNG_APPLIST_ALIPAY_IMAGE, "支付宝", nullptr}, #endif diff --git a/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/include/BrightnessLevelPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/include/BrightnessLevelPresenter.h new file mode 100644 index 000000000..d7bf380e8 --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/include/BrightnessLevelPresenter.h @@ -0,0 +1,42 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-04-16 14:37:08 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-04-16 16:08:41 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/include/BrightnessLevelPresenter.h + */ + +#ifndef BRIGHTNESS_LEVEL_PRESENTER_H +#define BRIGHTNESS_LEVEL_PRESENTER_H + +#include "Presenter.h" +#include "View.h" + +namespace OHOS +{ + class BrightnessLevelView; + class BrightnessLevelPresenter : public Presenter, + public UIView::OnClickListener, + public RootView::OnKeyActListener, + public UIView::OnDragListener + { + public: + BrightnessLevelPresenter(); + virtual ~BrightnessLevelPresenter(); + + void OnStart() override; + void OnPause() override; + void OnResume() override; + void OnStop() override; + + static BrightnessLevelPresenter *GetInstance(); + + private: + bool OnClick(UIView &view, const ClickEvent &event) override; + bool OnDrag(UIView &view, const DragEvent &event) override; + bool OnDragEnd(UIView &view, const DragEvent &event) override; + bool OnKeyAct(UIView &view, const KeyEvent &event) override; // 增加按键事件 + }; +} + +#endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/include/BrightnessLevelView.h b/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/include/BrightnessLevelView.h new file mode 100644 index 000000000..e12fe66ad --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/include/BrightnessLevelView.h @@ -0,0 +1,39 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-04-16 14:37:15 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-04-16 16:11:46 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/include/BrightnessLevelView.h + */ +#ifndef BRIGHTNESS_LEVEL_VIEW_H +#define BRIGHTNESS_LEVEL_VIEW_H + +#include "BaseView.h" +#include "View.h" +#include "displaybrightness/include/BrightnessControlView.h" +#include "components/ui_scroll_view.h" +namespace OHOS +{ + + class BrightnessLevelPresenter; + class BrightnessLevelView : public View + { + + public: + BrightnessLevelView(); + virtual ~BrightnessLevelView(); + static BrightnessLevelView *GetInstance(void); + + void OnStart() override; + void OnSetUpView() override; + void OnTearDownView() override; + void OnStop() override; + + private: + void BrightnessLevelViewInit(void); + void ClearAll(void); + UIScrollView *scorllView{nullptr}; + BrightnessControlView *p_BrightnessControlView{nullptr}; + }; +} +#endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/src/BrightnessLevelPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/src/BrightnessLevelPresenter.cpp new file mode 100644 index 000000000..530f718b9 --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/src/BrightnessLevelPresenter.cpp @@ -0,0 +1,93 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-04-16 14:36:45 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-04-16 17:30:38 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/src/BrightnessLevelPresenter.cpp + */ +#include "brightnesslevel/include/BrightnessLevelPresenter.h" +#include "AppViewIDs.h" +#include "NativeAbility.h" +#include "common/key_code.h" +#include +namespace OHOS +{ + + // 当前Presenter属性实例化的内存指针 + static BrightnessLevelPresenter *g_pBrightnessLevelPresenter = nullptr; + + BrightnessLevelPresenter::BrightnessLevelPresenter() + { + g_pBrightnessLevelPresenter = this; + } + + BrightnessLevelPresenter::~BrightnessLevelPresenter() + { + g_pBrightnessLevelPresenter = nullptr; + } + + BrightnessLevelPresenter *BrightnessLevelPresenter::GetInstance() + { + return g_pBrightnessLevelPresenter; + } + + void BrightnessLevelPresenter::OnStart() + { + Presenter::OnStart(); + } + + void BrightnessLevelPresenter::OnPause(void) + { + Presenter::OnPause(); + } + + void BrightnessLevelPresenter::OnResume(void) + { + Presenter::OnResume(); + } + + void BrightnessLevelPresenter::OnStop(void) + { + Presenter::OnStop(); + } + + bool BrightnessLevelPresenter::OnClick(UIView &view, const ClickEvent &event) + { + + return true; + } + + bool BrightnessLevelPresenter::OnDrag(UIView &view, const DragEvent &event) + { + UNUSED(view); + UNUSED(event); + return true; + } + + bool BrightnessLevelPresenter::OnDragEnd(UIView &view, const DragEvent &event) + { + UNUSED(view); + if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) + { + // NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); + uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId(); + NativeAbility::GetInstance().ChangeSlice(preSlice); + } + return true; + } + + bool BrightnessLevelPresenter::OnKeyAct(UIView &view, const KeyEvent &event) // 增加按键事件 + { + UNUSED(view); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessPresenter::OnKeyAct"); + unsigned short keyID = event.GetKeyId(); + unsigned short keyState = event.GetState(); + // 如果是power键,且是亮屏状态,按键释放就返回上一级 + if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0) + { + uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId(); + NativeAbility::GetInstance().ChangeSlice(preSlice); + } + return true; + } +} \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/src/BrightnessLevelView.cpp b/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/src/BrightnessLevelView.cpp new file mode 100644 index 000000000..c592d613f --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/src/BrightnessLevelView.cpp @@ -0,0 +1,102 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-04-16 14:36:13 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-04-16 16:18:00 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/src/BrightnessLevelView.cpp + */ +#include "brightnesslevel/include/BrightnessLevelView.h" +#include "brightnesslevel/include/BrightnessLevelPresenter.h" +#include "wearable_log.h" + +namespace OHOS +{ + + static BrightnessLevelView *g_pBrightnessLevelView{nullptr}; + + BrightnessLevelView::BrightnessLevelView() + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BrightnessLevelView::BrightnessLevelView"); + g_pBrightnessLevelView = this; + } + + BrightnessLevelView::~BrightnessLevelView() + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "~BrightnessLevelView::BrightnessLevelView"); + ClearAll(); + g_pBrightnessLevelView = nullptr; + } + + BrightnessLevelView *BrightnessLevelView::GetInstance() + { + return g_pBrightnessLevelView; + } + + void BrightnessLevelView::ClearAll(void) + { + if (p_BrightnessControlView != nullptr) + { + scorllView = nullptr; + + delete p_BrightnessControlView; + p_BrightnessControlView = nullptr; + } + } + + void BrightnessLevelView::BrightnessLevelViewInit(void) + { + p_BrightnessControlView = new BrightnessControlView(); + if (p_BrightnessControlView == nullptr) + { + 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; + } + UIView::OnDragListener *draglistener = static_cast(BrightnessLevelPresenter::GetInstance()); + if (draglistener == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[BrightnessLevelView::BrightnessLevelViewInit] draglistener can not be nullptr!"); + return; + } + scorllView->SetOnDragListener(draglistener); + } + + void BrightnessLevelView::OnStart() + { + View::OnStart(); + BrightnessLevelViewInit(); + + // 增加按键监听 + RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::BrightnessLevelPresenter::GetInstance(); + RootView::GetInstance()->SetOnKeyActListener(keyactListener); + } + + void BrightnessLevelView::OnSetUpView() + { + + View::OnSetUpView(); + RootView::GetInstance()->Add(scorllView); + Draw(); + } + + void BrightnessLevelView::OnTearDownView() + { + + View::OnTearDownView(); + return; + } + + void BrightnessLevelView::OnStop() + { + + View::OnStop(); + RootView::GetInstance()->RemoveAll(); + RootView::GetInstance()->ClearOnKeyActListener(); + return; + } +} \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h b/code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h index ec34b9e1e..f98455187 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h @@ -138,7 +138,9 @@ namespace OHOS void SetDnotdisturb(bool state); bool GetDnotdisturb(void); - + + void SetBrightness(int level); + int GetBrightness(void); // -------------------------------------------------------------------------- */ private: configmodel_item configmodel_item_key_name[CONFIGMODEL_ITEM_MAX] = diff --git a/code/sdk/application/wearable/fd230app/nativeui/config/src/ConfigModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/config/src/ConfigModel.cpp index 7c2d619ca..06ae02741 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/config/src/ConfigModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/config/src/ConfigModel.cpp @@ -621,6 +621,18 @@ namespace OHOS return get_configData_bool(CONFIGMODEL_ITEM_DNOTDISTURB); } + // 设置亮度值 + void ConfigModel::SetBrightness(int level) + { + set_condigData_Int(CONFIGMODEL_ITEM_SCREEN_BRIGHTNESS_VALUE,level); + } + + // 获取亮度值 + int ConfigModel::GetBrightness(void) + { + return get_configData_int(CONFIGMODEL_ITEM_SCREEN_BRIGHTNESS_VALUE); + } + /* ---------------------------------------------------------------------------- */ int ConfigModel::get_configData_int(ConfigItem item) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/BrightnessControlView.h b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/BrightnessControlView.h index f69f88b9d..1b087f3c6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/BrightnessControlView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/BrightnessControlView.h @@ -1,3 +1,10 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-01-29 15:37:44 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-04-16 16:51:33 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/BrightnessControlView.h + */ #ifndef BRIGHTNESS_CONTROL_VIEW_H #define BRIGHTNESS_CONTROL_VIEW_H @@ -6,6 +13,7 @@ #include "components/ui_scroll_view.h" #include "components/ui_slider.h" #include "components/ui_image_view.h" +#include namespace OHOS { #define BRIGHTNESS_MIN 51 @@ -13,7 +21,23 @@ namespace OHOS #define BRIGHTNESS_PROGRESS "progress" static const char *BRIGHTNESS_CONTROL_SLIDER = "BrightnessControlViewSlider"; + class BrightnessSliderEventListener : public UISlider::UISliderEventListener, + public UIView::OnClickListener, + public UIView::OnDragListener + { + public: + BrightnessSliderEventListener(); + ~BrightnessSliderEventListener(); + static std::shared_ptr GetInstance(); + void ChangeBrightness(uint8_t status, uint8_t value); + void OnChange(int32_t value) override; + void OnRelease(int32_t value) override; + bool OnClick(UIView &view, const ClickEvent &event) override; + bool OnDrag(UIView &view, const DragEvent &event) override; + private: + int32_t BrightnessValue; // 亮度值 + }; class BrightnessControlView { public: diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessModel.h b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessModel.h index f4947bdad..a9eb81032 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessModel.h @@ -1,3 +1,10 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-04-12 20:11:04 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-04-16 17:05:46 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessModel.h + */ #ifndef DISPLAY_BRIGHTNESS_MODEL_H_ #define DISPLAY_BRIGHTNESS_MODEL_H_ @@ -11,7 +18,6 @@ namespace OHOS void SetRaiseToBrightnessCheckBoxButtonStatus(bool value); bool RaiseToBrightnessCheckBoxButtonStatusInit(void); void KeepScreenBrightnessValues(unsigned char value); - bool BrightnessControlViewSliderValuesInit(void); void KeepScreenDurationRadioButtonSlectStatus(unsigned int value); bool ScreenDurationRadioButtonSlectStatusInit(void); void SetScreenDurationTime(unsigned int time); diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessPresenter.h index 74abb5b2f..d1f38af7b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessPresenter.h @@ -1,3 +1,10 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-02-18 09:10:05 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-04-16 17:08:18 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessPresenter.h + */ #ifndef _DISPLAY_BRIGHTNESS_PRESENTER_H #define _DISPLAY_BRIGHTNESS_PRESENTER_H @@ -11,7 +18,6 @@ namespace OHOS typedef enum { DISPLAYBRIGHTNESSVIEW = 0, // 屏幕与亮度视图(slice) - BRIGHTNESSCONTROLVIEW, // 亮度调节视图(subView) SCREENDURATIONVIEW, // 亮屏时长视图(subView) MAX_DISPLAYBRIGHTNESSVIEWID, } DISPLAYBRIGHTNESSVIEWID; @@ -47,23 +53,6 @@ namespace OHOS static const char *SCREENDURATION_TENSECONDS_VIEWID = "SCREENDURATION_TENSECONDS"; // 10秒时长 static const char *SCREENDURATION_FIFTEENSECONDS_VIEWID = "SCREENDURATION_FIFTEENSECONDS"; // 15秒时长 - class BrightnessSliderEventListener : public UISlider::UISliderEventListener, - public UIView::OnClickListener, - public UIView::OnDragListener - { - public: - BrightnessSliderEventListener(); - ~BrightnessSliderEventListener(); - static BrightnessSliderEventListener *GetInstance(void); - void ChangeBrightness(uint8_t status, uint8_t value); - void OnChange(int32_t value) override; - void OnRelease(int32_t value) override; - bool OnClick(UIView &view, const ClickEvent &event) override; - bool OnDrag(UIView &view, const DragEvent &event) override; - - private: - int32_t BrightnessValue; // 亮度值 - }; class ScreenDurationRadiobuttonOnChangeListener : public UICheckBox::OnChangeListener { @@ -97,7 +86,6 @@ namespace OHOS static DisplayBrightnessPresenter *GetInstance(); void SetRaiseToBrightnessState(bool value); - void SetScreenBrightnessValues(unsigned char value); void SetScreenDurationRadioButtonSlectStatus(uint32_t value); private: diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessView.h b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessView.h index cf1725972..79426568a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessView.h @@ -11,7 +11,6 @@ #include "components/ui_checkbox.h" #include "components/ui_radio_button.h" #include "DisplayBrightnessPresenter.h" -#include "displaybrightness/include/BrightnessControlView.h" #include "displaybrightness/include/ScreenDurationView.h" namespace OHOS { @@ -64,7 +63,6 @@ namespace OHOS void DisplayAndBrightnessViewInit(void); void ClearAll(void); bool ChangeDisplayBrightnessView(int16_t thisView); // 切换到“屏幕与亮度”视图 - bool ChangeBrightnessControlView(int16_t thisView); // 切换到“亮度调节”视图 bool ChangeScreenDurationView(int16_t thisView); // 切换到亮屏时长视图 bool ClickFunc(int16_t interface); void ChangeView(int16_t hideView, int16_t showView); @@ -79,7 +77,6 @@ namespace OHOS void OnStop() override; private: - BrightnessControlView *p_BrightnessControlView{nullptr}; // 亮度调节视图 ScreenDurationView *p_ScreenDurationView{nullptr}; // 亮屏时长视图 private: bool SetUpScrollView(void); @@ -92,7 +89,7 @@ namespace OHOS bool InitDisplayBrightnessViewImage(void); UICheckBox *SetUpCheckBox(CheckBoxConfig &checkboxconfig); // 设置复选框 bool InitDisplayBrightnessViewCheckBox(void); - UIScrollView *DisplayBrightnessScrollView[3]{nullptr}; // “3”表示有三个界面 + UIScrollView *DisplayBrightnessScrollView[2]{nullptr}; UILabel *DisplayBrightnessTitleLabel = nullptr; // 显示与亮度标题 UIButton *BringhtnessControlButton = nullptr; // 亮度调节按钮 UIButton *ScreenDurationButton = nullptr; // 亮屏时长按钮 diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/BrightnessControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/BrightnessControlView.cpp index ab7a7f180..750aeb0a6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/BrightnessControlView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/BrightnessControlView.cpp @@ -1,7 +1,9 @@ #include "displaybrightness/include/BrightnessControlView.h" #include "displaybrightness/include/DisplayBrightnessPresenter.h" -#include "displaybrightness/include/DisplayBrightnessModel.h" #include "wearable_log.h" +#include +#include "power_display_service.h" +#include "config/include/ConfigModel.h" namespace OHOS { static BrightnessControlView *g_pBrightnessControlView{nullptr}; @@ -29,10 +31,9 @@ namespace OHOS { BrightnessControlScrollView->RemoveAll(); - unsigned char value = BrightnessControlViewSlider->GetValue(); - DisplayBrightnessModel::GetInstance()->KeepScreenBrightnessValues(value); - // ConfigModel::GetInstance()->WriteJsonData_Int(ConfigModel::GetInstance()->GetcJSON(),"ScreenBrightnessValue",value); - ConfigModel::GetInstance()->set_condigData_Int(ConfigModel::ConfigItem::CONFIGMODEL_ITEM_SCREEN_BRIGHTNESS_VALUE,value); + int value = BrightnessControlViewSlider->GetValue(); + ConfigModel::GetInstance()->SetBrightness(value); + delete BrightnessControlViewSlider; BrightnessControlViewSlider = nullptr; @@ -54,13 +55,6 @@ namespace OHOS return false; } BrightnessControlScrollView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); - UIView::OnDragListener *draglistener = static_cast(DisplayBrightnessPresenter::GetInstance()); - if (draglistener == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BrightnessControlView::draglistener can not be nullptr!"); - return false; - } - BrightnessControlScrollView->SetOnDragListener(draglistener); BrightnessControlScrollView->SetTouchable(true); BrightnessControlScrollView->SetDraggable(true); return true; @@ -86,20 +80,16 @@ namespace OHOS BrightnessControlViewSlider->SetForegroundStyle(STYLE_LINE_CAP, CapType::CAP_ROUND); BrightnessControlViewSlider->SetSliderColor(Color::GetColorFromRGBA(0x19, 0x19, 0x19, 0xff), Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0xff)); BrightnessControlViewSlider->SetForegroundStyle(STYLE_BACKGROUND_OPA, 0xff); + BrightnessControlViewSlider->SetValue(ConfigModel::GetInstance()->GetBrightness()); + BrightnessControlViewSlider->SetIntercept(true); - BrightnessSliderEventListener *listener = nullptr; - if (listener == nullptr) - { - listener = new BrightnessSliderEventListener(); - if (listener == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Listener new fail!"); - return false; - } - } - BrightnessControlViewSlider->SetSliderEventListener(listener); - BrightnessControlViewSlider->SetOnClickListener(listener); - BrightnessControlViewSlider->SetOnDragListener(listener); + /* + 注意,使用get方法获取的原生指针不应被用来管理对象的生命周期(不要用它去调用delete),因为智能指针会自动处理对象的销毁。 + */ + BrightnessSliderEventListener *rawPointer = BrightnessSliderEventListener::GetInstance().get(); + BrightnessControlViewSlider->SetSliderEventListener(rawPointer ); + BrightnessControlViewSlider->SetOnClickListener(rawPointer ); + BrightnessControlViewSlider->SetOnDragListener(rawPointer ); BrightnessControlViewSlider->SetKnobStyle(StyleDefault::GetSliderKnobStyle()); return true; } @@ -151,12 +141,6 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BrightnessControlView::BrightnessControlViewImageIcon is nullptr!"); return nullptr; } - - if(!DisplayBrightnessModel::GetInstance()->BrightnessControlViewSliderValuesInit()) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BrightnessControlView::BrightnessControlViewSliderValuesInit fail!"); - return nullptr; - } /* ----------------------------------- Add ---------------------------------- */ BrightnessControlScrollView->Add(BrightnessControlViewSlider); BrightnessControlScrollView->Add(BrightnessControlViewImageIcon); @@ -164,4 +148,123 @@ namespace OHOS return BrightnessControlScrollView; } + /* -------------------------------------------------------------------------- */ + static BrightnessSliderEventListener *g_pBrightnessSliderEventListener{nullptr}; + constexpr int16_t BRIGHTNESS_CHANGE = 10; + + BrightnessSliderEventListener::BrightnessSliderEventListener() + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BrightnessSliderEventListener::BrightnessSliderEventListener"); + g_pBrightnessSliderEventListener = this; + } + + BrightnessSliderEventListener::~BrightnessSliderEventListener() + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BrightnessSliderEventListener::~BrightnessSliderEventListener"); + g_pBrightnessSliderEventListener = nullptr; + } + + std::shared_ptr BrightnessSliderEventListener::GetInstance(void) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BrightnessSliderEventListener::GetInstance"); + static std::shared_ptr instance(new BrightnessSliderEventListener()); + return instance; + } + + /// @brief 改变屏幕状态 + /// @param status + void BrightnessSliderEventListener::ChangeBrightness(uint8_t status, uint8_t value) + { + // 1.获取 BrightnessControlView 的实例: + BrightnessControlView *p_BrightnessControlView = BrightnessControlView::GetInstance(); + // 2.检查 BrightnessControlView 指针是否为 nullptr,并在为 nullptr 时打印错误日志并返回 + if (p_BrightnessControlView == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BrightnessControlView::GetInstance fail!"); + return; + } + // 3.获取 p_BrightnessControlView 的进度条 UISlider 实例的指针: + UISlider *progress = p_BrightnessControlView->GetBrightnessControlViewSlider(); + // 4.检查 progress 指针是否为 nullptr,并在为 nullptr 时打印错误日志并返回: + if (progress == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ChangeBrightness:progress is nullptr!"); + return; + } + // 5.保存当前亮度到变量 BrightnessValue + BrightnessValue = p_BrightnessControlView->CurrentBrightnessValue; + + // 6.获取显示功耗管理服务API接口. + const power_display_svr_api_t *display_api = power_display_svr_get_api(); + // 7.根据传入的 status 值进行亮度变化操作 + switch (status) + { + case BRIGHTNESSLOWERS: + /* code */ + p_BrightnessControlView->CurrentBrightnessValue = progress->GetValue() - BRIGHTNESS_CHANGE; + if (p_BrightnessControlView->CurrentBrightnessValue < BRIGHTNESS_MIN) + { + p_BrightnessControlView->CurrentBrightnessValue = BRIGHTNESS_MIN; + } + break; + case BRIGHTNESSEVATED: + p_BrightnessControlView->CurrentBrightnessValue = progress->GetValue() + BRIGHTNESS_CHANGE; + if (p_BrightnessControlView->CurrentBrightnessValue > BRIGHTNESS_MAX) + { + p_BrightnessControlView->CurrentBrightnessValue = BRIGHTNESS_MAX; + } + break; + case BRIGHTNESSDRAG: + p_BrightnessControlView->CurrentBrightnessValue = value; + if (p_BrightnessControlView->CurrentBrightnessValue < BRIGHTNESS_MIN) + { + p_BrightnessControlView->CurrentBrightnessValue = BRIGHTNESS_MIN; + } + else if (p_BrightnessControlView->CurrentBrightnessValue > BRIGHTNESS_MAX) + { + p_BrightnessControlView->CurrentBrightnessValue = BRIGHTNESS_MAX; + } + break; + default: + break; + } + // 8.将 p_BrightnessControlView->CurrentBrightnessValue 的值赋给 progress 的值,更新进度条的显示: + progress->SetValue(p_BrightnessControlView->CurrentBrightnessValue); + + // 9.设置当前亮度值并检查是否设置成功 + if (display_api->set_brightness(p_BrightnessControlView->CurrentBrightnessValue) != ERRCODE_SUCC) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ChangeBrightness: set_brightness fail!"); + return; + } + } + + /// @brief 当滑动条被拖动或点击时调用 + /// @param value 滑块的当前值。 + void BrightnessSliderEventListener::OnChange(int32_t value) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnChange %d", value); + ChangeBrightness(BRIGHTNESSDRAG, value); + } + + /// @brief 当滑动条被释放时调用 + /// @param value 滑块的当前值。 + void BrightnessSliderEventListener::OnRelease(int32_t value) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnRelease %d", value); + ChangeBrightness(BRIGHTNESSDRAG, value); + } + + bool BrightnessSliderEventListener::OnClick(UIView &view, const ClickEvent &event) + { + UNUSED(event); + UNUSED(view); + return true; + } + bool BrightnessSliderEventListener::OnDrag(UIView &view, const DragEvent &event) + { + UNUSED(event); + UNUSED(view); + return true; + } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessModel.cpp index 45d3abfb4..99cd15ef2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessModel.cpp @@ -51,18 +51,6 @@ namespace OHOS ScreenBrightnessValue = value; } - // 亮度控制视图亮度Slider值初始化 - bool DisplayBrightnessModel::BrightnessControlViewSliderValuesInit(void) - { - DisplayBrightnessPresenter *displayBrightnessPresent = DisplayBrightnessPresenter::GetInstance(); - if (displayBrightnessPresent == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessViewAndSubViewComponentsStatusInit DisplayBrightnessPresenter GetInstance fail"); - return false; - } - displayBrightnessPresent->SetScreenBrightnessValues(ScreenBrightnessValue); - return true; - } /// @brief 保存哪个亮屏时长按钮被选中 /// @param value 0 5秒后熄屏 1 10秒后熄屏 2 15秒后熄屏 diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp index 624dc53f4..a0f2433c5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp @@ -50,23 +50,6 @@ namespace OHOS } } - /// @brief 设置亮度值 - /// @param value - void DisplayBrightnessPresenter::SetScreenBrightnessValues(unsigned char value) - { - BrightnessControlView *p_BrightnessControlView = BrightnessControlView::GetInstance(); - if (p_BrightnessControlView == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetScreenBrightnessValues BrightnessControlView GetInstance fail"); - return; - } - if (value >= BRIGHTNESS_MIN && value <= BRIGHTNESS_MAX) - { - p_BrightnessControlView->SetScreenBrightnessValue(value); - DisplayBrightnessModel::GetInstance()->KeepScreenBrightnessValues(0xff); // 将Model层保存的状态清除 - } - } - /// @brief 根据value值设置哪个按钮被选中 /// @param value void DisplayBrightnessPresenter::SetScreenDurationRadioButtonSlectStatus(uint32_t value) @@ -121,7 +104,7 @@ namespace OHOS // 根据控件id查找是哪个控件触发了点击回调 if (strcmp(view.GetViewId(), BRINGHTNESSCONTROLBUTTON_VIEW) == 0) { - p_DisplayBrightnessView->ChangeView(DISPLAYBRIGHTNESSVIEW, BRIGHTNESSCONTROLVIEW); // 切换到亮度调节视图 + NativeAbility::GetInstance().ChangeSlice(VIEW_BRIGHTNESSLEVEL); return true; } if (strcmp(view.GetViewId(), SCREENDURATIONBUTTON_VIEWID) == 0) @@ -134,6 +117,8 @@ namespace OHOS bool DisplayBrightnessPresenter::OnDrag(UIView &view, const DragEvent &event) { + UNUSED(view); + UNUSED(event); return true; } @@ -158,9 +143,8 @@ namespace OHOS break; } } - return true; } - return false; + return true; } bool DisplayBrightnessPresenter::OnChange(UICheckBox::UICheckBoxState state) @@ -189,7 +173,15 @@ namespace OHOS if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0) { uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId(); - NativeAbility::GetInstance().ChangeSlice(preSlice); + if (preSlice == VIEW_BRIGHTNESSLEVEL) + { + NativeAbility::GetInstance().ChangeSlice(VIEW_SETTING); + } + else + { + + NativeAbility::GetInstance().ChangeSlice(preSlice); + } } return true; } @@ -240,123 +232,4 @@ namespace OHOS return false; } - static BrightnessSliderEventListener *g_pBrightnessSliderEventListener{nullptr}; - - constexpr int16_t BRIGHTNESS_CHANGE = 10; - - BrightnessSliderEventListener::BrightnessSliderEventListener() - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BrightnessSliderEventListener::BrightnessSliderEventListener"); - g_pBrightnessSliderEventListener = this; - } - - BrightnessSliderEventListener::~BrightnessSliderEventListener() - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BrightnessSliderEventListener::~BrightnessSliderEventListener"); - g_pBrightnessSliderEventListener = nullptr; - } - - BrightnessSliderEventListener *BrightnessSliderEventListener::GetInstance(void) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BrightnessSliderEventListener::GetInstance"); - return g_pBrightnessSliderEventListener; - } - - /// @brief 改变屏幕状态 - /// @param status - void BrightnessSliderEventListener::ChangeBrightness(uint8_t status, uint8_t value) - { - // 1.获取 BrightnessControlView 的实例: - BrightnessControlView *p_BrightnessControlView = BrightnessControlView::GetInstance(); - // 2.检查 BrightnessControlView 指针是否为 nullptr,并在为 nullptr 时打印错误日志并返回 - if (p_BrightnessControlView == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BrightnessControlView::GetInstance fail!"); - return; - } - // 3.获取 p_BrightnessControlView 的进度条 UISlider 实例的指针: - UISlider *progress = p_BrightnessControlView->GetBrightnessControlViewSlider(); - // 4.检查 progress 指针是否为 nullptr,并在为 nullptr 时打印错误日志并返回: - if (progress == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ChangeBrightness:progress is nullptr!"); - return; - } - // 5.保存当前亮度到变量 BrightnessValue - BrightnessValue = p_BrightnessControlView->CurrentBrightnessValue; - - // 6.获取显示功耗管理服务API接口. - const power_display_svr_api_t *display_api = power_display_svr_get_api(); - // 7.根据传入的 status 值进行亮度变化操作 - switch (status) - { - case BRIGHTNESSLOWERS: - /* code */ - p_BrightnessControlView->CurrentBrightnessValue = progress->GetValue() - BRIGHTNESS_CHANGE; - if (p_BrightnessControlView->CurrentBrightnessValue < BRIGHTNESS_MIN) - { - p_BrightnessControlView->CurrentBrightnessValue = BRIGHTNESS_MIN; - } - break; - case BRIGHTNESSEVATED: - p_BrightnessControlView->CurrentBrightnessValue = progress->GetValue() + BRIGHTNESS_CHANGE; - if (p_BrightnessControlView->CurrentBrightnessValue > BRIGHTNESS_MAX) - { - p_BrightnessControlView->CurrentBrightnessValue = BRIGHTNESS_MAX; - } - break; - case BRIGHTNESSDRAG: - p_BrightnessControlView->CurrentBrightnessValue = value; - if (p_BrightnessControlView->CurrentBrightnessValue < BRIGHTNESS_MIN) - { - p_BrightnessControlView->CurrentBrightnessValue = BRIGHTNESS_MIN; - } - else if (p_BrightnessControlView->CurrentBrightnessValue > BRIGHTNESS_MAX) - { - p_BrightnessControlView->CurrentBrightnessValue = BRIGHTNESS_MAX; - } - break; - default: - break; - } - // 8.将 p_BrightnessControlView->CurrentBrightnessValue 的值赋给 progress 的值,更新进度条的显示: - progress->SetValue(p_BrightnessControlView->CurrentBrightnessValue); - - // 9.设置当前亮度值并检查是否设置成功 - if (display_api->set_brightness(p_BrightnessControlView->CurrentBrightnessValue) != ERRCODE_SUCC) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ChangeBrightness: set_brightness fail!"); - return; - } - } - - /// @brief 当滑动条被拖动或点击时调用 - /// @param value 滑块的当前值。 - void BrightnessSliderEventListener::OnChange(int32_t value) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnChange %d", value); - ChangeBrightness(BRIGHTNESSDRAG, value); - } - - /// @brief 当滑动条被释放时调用 - /// @param value 滑块的当前值。 - void BrightnessSliderEventListener::OnRelease(int32_t value) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnRelease %d", value); - ChangeBrightness(BRIGHTNESSDRAG, value); - } - - bool BrightnessSliderEventListener::OnClick(UIView &view, const ClickEvent &event) - { - UNUSED(event); - UNUSED(view); - return true; - } - bool BrightnessSliderEventListener::OnDrag(UIView &view, const DragEvent &event) - { - UNUSED(event); - UNUSED(view); - return true; - } - } \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp index 067dd11c9..d0f053ba6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp @@ -75,9 +75,6 @@ namespace OHOS delete RaiseToBrightnessCheckBoxButton; RaiseToBrightnessCheckBoxButton = nullptr; - delete p_BrightnessControlView; - p_BrightnessControlView = nullptr; - delete p_ScreenDurationView; p_ScreenDurationView = nullptr; @@ -430,24 +427,6 @@ namespace OHOS return true; } - // 2.切换到“亮度调节”视图 - bool DisplayBrightnessView::ChangeBrightnessControlView(int16_t thisView) - { - if (DisplayBrightnessScrollView[thisView] == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessView::ChangeBrightnessControlView"); - p_BrightnessControlView = new BrightnessControlView(); - if (p_BrightnessControlView == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessView:: new scrollView[%d] fail", thisView); - return false; - } - DisplayBrightnessScrollView[thisView] = p_BrightnessControlView->BrightnessControlViewInit(); - RootView::GetInstance()->Add(DisplayBrightnessScrollView[thisView]); - } - return true; - } - // 3.切换到“亮屏时长”视图 bool DisplayBrightnessView::ChangeScreenDurationView(int16_t thisView) { @@ -477,7 +456,6 @@ namespace OHOS // 2.ViewMapper[] 是一个静态的视图映射数组,将视图ID与DisplayBrightnessViewMapper类中的特定成员函数指针进行了绑定。 static const DisplayBrightnessViewMapper ViewMapper[] = { {DISPLAYBRIGHTNESSVIEW, &DisplayBrightnessView::ChangeDisplayBrightnessView}, - {BRIGHTNESSCONTROLVIEW, &DisplayBrightnessView::ChangeBrightnessControlView}, {SCREENDURATIONVIEW, &DisplayBrightnessView::ChangeScreenDurationView}, };