From: luozheng <1732036298@qq.com> Date: Mon, 26 Feb 2024 01:56:12 +0000 (+0800) Subject: 修改显示与亮度视图 X-Git-Tag: release_V1.2.70_20241020_135402~1298^2~12^2 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=cb0753e4d2324d1261cc5c6d17c66c14458e171a;p=mirrors%2FFD230.git 修改显示与亮度视图 --- 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 b839182c5..8f2c468a8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessPresenter.h @@ -26,17 +26,15 @@ namespace OHOS class ScreenDurationRadiobuttonOnChangeListener : public UICheckBox::OnChangeListener { public: - ScreenDurationRadiobuttonOnChangeListener(){} - ~ScreenDurationRadiobuttonOnChangeListener() {} - bool isRadioButtonSelected(int index); - void SetRadioButton(UIRadioButton *radiobutton, int16_t i) + ScreenDurationRadiobuttonOnChangeListener(UIView *view) { - m_radiobutton[i] = radiobutton; + m_view = view; } + ~ScreenDurationRadiobuttonOnChangeListener() {} bool OnChange(UICheckBox::UICheckBoxState state) override; private: - UIRadioButton *m_radiobutton[3]{nullptr}; + UIView *m_view{nullptr}; }; class DisplayBrightnessView; @@ -56,6 +54,7 @@ namespace OHOS static DisplayBrightnessPresenter *GetInstance(); void SetRaiseToBrightnessState(bool value); + private: // 因为继承了OnClickListener,所以有OnClick属性,至于参数,原函数也这样直接继承; bool OnClick(UIView &view, const ClickEvent &event) override; 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 205e0ecf5..65fd31ff7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessView.h @@ -70,6 +70,7 @@ namespace OHOS UIScrollView *GetDisplayBrightnessScrollView(int16_t i); UICheckBox::UICheckBoxState GetRaiseToBrightnessCheckBoxButtonState(void); void SetRaiseToBrightnessCheckBoxButtonState(UICheckBox::UICheckBoxState state); + ScreenDurationView * GetScreenDurationView(void); public: void OnStart() override; void OnSetUpView() override; 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 c5f92ac6c..78b2a1814 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp @@ -29,7 +29,7 @@ namespace OHOS } /// @brief 设置抬腕亮屏状态 - /// @param value + /// @param value void DisplayBrightnessPresenter::SetRaiseToBrightnessState(bool value) { DisplayBrightnessView *displayBrightnessView = DisplayBrightnessView::GetInstance(); @@ -41,7 +41,7 @@ namespace OHOS if (value != false) { displayBrightnessView->SetRaiseToBrightnessCheckBoxButtonState(UICheckBox::UICheckBoxState::SELECTED); - DisplayBrightnessModel::GetInstance()->SetRaiseToBrightnessCheckBoxButtonStatus(false);//将Model层保存的状态清除 + DisplayBrightnessModel::GetInstance()->SetRaiseToBrightnessCheckBoxButtonStatus(false); // 将Model层保存的状态清除 } } @@ -166,37 +166,42 @@ namespace OHOS return true; } - bool ScreenDurationRadiobuttonOnChangeListener::isRadioButtonSelected(int index) + bool ScreenDurationRadiobuttonOnChangeListener::OnChange(UICheckBox::UICheckBoxState state) { - if (m_radiobutton[index]->GetState() == UICheckBox::SELECTED) + DisplayBrightnessView *p_DisplayBrightnessView = DisplayBrightnessView::GetInstance(); + if (p_DisplayBrightnessView == nullptr) { - return true; + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessView::GetInstance fail!"); + return false; } - return false; - } - - bool ScreenDurationRadiobuttonOnChangeListener::OnChange(UICheckBox::UICheckBoxState state) - { - for (int i = 0; i < 3; i++) + switch (state) { - if (isRadioButtonSelected(i)) + case UICheckBox::SELECTED: + if (p_DisplayBrightnessView->GetScreenDurationView() != nullptr) { - switch (i) + if (p_DisplayBrightnessView->GetScreenDurationView()->GetRadioButton(0) == (UIView *)m_view) { - case 0: WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Switched to 5 seconds"); - break; - case 1: + return true; + } + else if (p_DisplayBrightnessView->GetScreenDurationView()->GetRadioButton(1) == (UIView *)m_view) + { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Switched to 10 seconds"); - break; - case 2: + return true; + } + else if (p_DisplayBrightnessView->GetScreenDurationView()->GetRadioButton(2) == (UIView *)m_view) + { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Switched to 15 seconds"); - break; - default: - break; + return true; } } + + break; + case UICheckBox::UNSELECTED: + break; + default: + break; } - return true; + return false; } } \ 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 c7228dd68..866f6c647 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp @@ -394,12 +394,21 @@ namespace OHOS { if (DisplayBrightnessScrollView[i] == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessView::DisplayBrightnessScrollView[%d] is nullptr!", i); return nullptr; } return DisplayBrightnessScrollView[i]; } + ScreenDurationView * DisplayBrightnessView::GetScreenDurationView(void) + { + if(p_ScreenDurationView == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessView::GetScreenDurationView p_ScreenDurationView is nullptr!"); + return nullptr; + } + return p_ScreenDurationView; + } + // 1.切换到“屏幕与亮度”视图 bool DisplayBrightnessView::ChangeDisplayBrightnessView(int16_t thisView) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp index 6631a548d..83ede9b81 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp @@ -214,8 +214,6 @@ namespace OHOS int y_positions[] = {130, 250, 370}; const char *viewID[] = {SCREENDURATION_FIVESECONDS_VIEWID, SCREENDURATION_TENSECONDS_VIEWID, SCREENDURATION_FIFTEENSECONDS_VIEWID}; - ScreenDurationRadiobuttonOnChangeListener *p_ScreenDurationRadiobuttonOnChangeListener = new ScreenDurationRadiobuttonOnChangeListener(); - UICheckBox::OnChangeListener *SimplifiedChineseRadioButtonChange = static_cast(p_ScreenDurationRadiobuttonOnChangeListener); for (int i = 0; i < 3; i++) { radiobuttonconfig.y = y_positions[i]; @@ -226,7 +224,7 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScreenDurationView::ScreenDurationRadioButton[%d] is nullptr!", i); return false; } - p_ScreenDurationRadiobuttonOnChangeListener->SetRadioButton(ScreenDurationRadioButton[i],i); + UICheckBox::OnChangeListener *SimplifiedChineseRadioButtonChange = static_cast(new ScreenDurationRadiobuttonOnChangeListener(ScreenDurationRadioButton[i])); ScreenDurationRadioButton[i]->SetOnChangeListener(SimplifiedChineseRadioButtonChange); }