From 4af83d6bb01bcff8d3e60b8ab327a5daa90fff19 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E7=BD=97=E6=AD=A3?= <1732036298@qq.com> Date: Tue, 18 Jun 2024 09:46:29 +0000 Subject: [PATCH] Merge #310 into sdk602patch0521 from refs/changes/310/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 罗正 * refs/changes/310/head: (3 commits squashed) - 解决显示方式和天气bug - 1.优化显示与亮度视图目前能够同步更新显示(除了亮屏时长视图不能考虑重构中) 2.优化ui_service， - Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521 Signed-off-by: 罗正 <1732036298@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/310 --- .../include/BrightnessLevelView.h | 6 +- .../src/BrightnessLevelPresenter.cpp | 6 +- .../src/BrightnessLevelView.cpp | 32 +-- .../include/DisplayBrightnessModel.h | 9 +- .../src/BrightnessControlView.cpp | 7 +- .../src/DisplayBrightnessModel.cpp | 45 ++-- .../src/DisplayBrightnessPresent.cpp | 10 +- .../src/DisplayBrightnessView.cpp | 34 +-- .../src/ScreenDurationView.cpp | 34 +-- .../themestyle/include/ThemeStyleModel.h | 3 +- .../themestyle/src/ThemeStyleModel.cpp | 11 +- .../nativeui/uiservice/include/ui_service.h | 5 +- .../nativeui/uiservice/src/ui_service.cpp | 202 ++++++++++++++++++ .../nativeui/weather/src/WeatherModel.cpp | 5 +- .../ble_service/blemoder/CMakeLists.txt | 1 + .../service/ble_service/blemoder/bletest.cpp | 12 +- 16 files changed, 328 insertions(+), 94 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/include/BrightnessLevelView.h b/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/include/BrightnessLevelView.h index e12fe66ad..1815aa016 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/include/BrightnessLevelView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/include/BrightnessLevelView.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-16 14:37:15 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-04-16 16:11:46 + * @LastEditTime: 2024-06-18 15:30:17 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/include/BrightnessLevelView.h */ #ifndef BRIGHTNESS_LEVEL_VIEW_H @@ -23,6 +23,10 @@ namespace OHOS BrightnessLevelView(); virtual ~BrightnessLevelView(); static BrightnessLevelView *GetInstance(void); + BrightnessControlView *GetBrightnessControlView(void) + { + return p_BrightnessControlView; + } void OnStart() override; void OnSetUpView() override; diff --git a/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/src/BrightnessLevelPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/src/BrightnessLevelPresenter.cpp index ce294d44c..54241b427 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/src/BrightnessLevelPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/src/BrightnessLevelPresenter.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-16 14:36:45 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-06-07 10:40:39 + * @LastEditTime: 2024-06-18 15:19:37 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/src/BrightnessLevelPresenter.cpp */ #include "brightnesslevel/include/BrightnessLevelPresenter.h" @@ -69,7 +69,7 @@ namespace OHOS UNUSED(view); if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) { - NativeAbility::GetInstance().Back(); + NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); } return true; } @@ -83,7 +83,7 @@ namespace OHOS // 如果是power键,且是亮屏状态，按键释放就返回上一级 if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0) { - NativeAbility::GetInstance().Back(); + NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); } return true; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/src/BrightnessLevelView.cpp b/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/src/BrightnessLevelView.cpp index cdbc42431..5317340e9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/src/BrightnessLevelView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/src/BrightnessLevelView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-16 14:36:13 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-04-18 14:38:37 + * @LastEditTime: 2024-06-18 15:28:04 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/src/BrightnessLevelView.cpp */ #include "brightnesslevel/include/BrightnessLevelView.h" @@ -16,14 +16,13 @@ namespace OHOS BrightnessLevelView::BrightnessLevelView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BrightnessLevelView::BrightnessLevelView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BrightnessLevelView::BrightnessLevelView"); g_pBrightnessLevelView = this; } BrightnessLevelView::~BrightnessLevelView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BrightnessLevelView::~BrightnessLevelView"); - ClearAll(); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BrightnessLevelView::~BrightnessLevelView"); g_pBrightnessLevelView = nullptr; } @@ -57,20 +56,18 @@ namespace OHOS 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(); + SetContainerView(new UIViewGroup()); + container_->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); + container_->SetOnDragListener(presenter_); + container_->SetTouchable(true); + container_->SetDraggable(true); + BrightnessLevelViewInit(); // 增加按键监听 RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::BrightnessLevelPresenter::GetInstance(); RootView::GetInstance()->SetOnKeyActListener(keyactListener); @@ -78,9 +75,8 @@ namespace OHOS void BrightnessLevelView::OnSetUpView() { - View::OnSetUpView(); - RootView::GetInstance()->Add(scorllView); + container_->Add(scorllView); Draw(); } @@ -95,7 +91,13 @@ namespace OHOS { View::OnStop(); - RootView::GetInstance()->RemoveAll(); + if (container_ != nullptr) + { + container_->RemoveAll(); + delete container_; + container_ = nullptr; + ClearAll(); + } RootView::GetInstance()->ClearOnKeyActListener(); return; } 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 570346a9e..94af90d64 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessModel.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-12 20:11:04 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-04-18 15:36:31 + * @LastEditTime: 2024-06-18 15:14:25 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessModel.h */ #ifndef DISPLAY_BRIGHTNESS_MODEL_H_ @@ -15,9 +15,10 @@ namespace OHOS { public: static DisplayBrightnessModel *GetInstance(void); - bool RaiseToBrightnessCheckBoxButtonStatusInit(void); - bool ScreenDurationRadioButtonSlectStatusInit(void); - bool SelectScreenDurationLabelInit(void); + bool UpdateRaiseToBrightnessCheckBoxButtonStatus(void); + bool UpdateScreenDurationRadioButtonSlectStatus(void); + bool UpdateSelectScreenDurationLabel(void); + bool UpdateBrightnessValueOfSlider(void); void SetScreenDurationTime(unsigned int time); unsigned int GetScreenDurationTime(void); 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 aace0d419..da015affb 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/BrightnessControlView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/BrightnessControlView.cpp @@ -11,13 +11,13 @@ namespace OHOS static BrightnessControlView *g_pBrightnessControlView{nullptr}; BrightnessControlView::BrightnessControlView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BrightnessControlView::BrightnessControlView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BrightnessControlView::BrightnessControlView"); g_pBrightnessControlView = this; } BrightnessControlView::~BrightnessControlView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BrightnessControlView::~BrightnessControlView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BrightnessControlView::~BrightnessControlView"); ClearAll(); g_pBrightnessControlView = nullptr; } @@ -33,9 +33,6 @@ namespace OHOS { BrightnessControlScrollView->RemoveAll(); - // int value = BrightnessControlViewSlider->GetValue(); - // ConfigModel::GetInstance()->SetBrightness(value); - delete BrightnessControlViewSlider; BrightnessControlViewSlider = nullptr; 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 3784b821e..95fe4873b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessModel.cpp @@ -2,20 +2,19 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-12 20:11:04 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-04-18 15:34:22 + * @LastEditTime: 2024-06-18 15:31:55 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessModel.cpp */ #include "displaybrightness/include/DisplayBrightnessModel.h" #include "displaybrightness/include/DisplayBrightnessPresenter.h" +#include "brightnesslevel/include/BrightnessLevelView.h" #include "wearable_log.h" #include "ConfigModel.h" namespace OHOS { - DisplayBrightnessModel::DisplayBrightnessModel() - { - } + DisplayBrightnessModel::DisplayBrightnessModel() {} DisplayBrightnessModel::~DisplayBrightnessModel() {} @@ -25,12 +24,8 @@ namespace OHOS return &instance; } - - - /* - * @brief 抬腕亮屏按钮状态设置 - */ - bool DisplayBrightnessModel::RaiseToBrightnessCheckBoxButtonStatusInit(void) + // 更新抬腕亮屏按钮状态 + bool DisplayBrightnessModel::UpdateRaiseToBrightnessCheckBoxButtonStatus(void) { DisplayBrightnessPresenter *displayBrightnessPresent = DisplayBrightnessPresenter::GetInstance(); if (displayBrightnessPresent == nullptr) @@ -42,10 +37,8 @@ namespace OHOS return true; } - /// @brief 亮屏时长按钮选中状态初始化 - /// @param - /// @return - bool DisplayBrightnessModel::ScreenDurationRadioButtonSlectStatusInit(void) + // 更新亮屏时长按钮选中状态 + bool DisplayBrightnessModel::UpdateScreenDurationRadioButtonSlectStatus(void) { DisplayBrightnessPresenter *displayBrightnessPresent = DisplayBrightnessPresenter::GetInstance(); if (displayBrightnessPresent == nullptr) @@ -57,7 +50,8 @@ namespace OHOS return true; } - bool DisplayBrightnessModel::SelectScreenDurationLabelInit(void) + // 更新选择的亮屏时长标签内容 + bool DisplayBrightnessModel::UpdateSelectScreenDurationLabel(void) { DisplayBrightnessPresenter *displayBrightnessPresent = DisplayBrightnessPresenter::GetInstance(); if (displayBrightnessPresent == nullptr) @@ -66,6 +60,27 @@ namespace OHOS return false; } displayBrightnessPresent->SetSelectScreenDurationLabel(GetScreenDurationTime()); + UpdateRaiseToBrightnessCheckBoxButtonStatus(); + return true; + } + + //更新亮度条的亮度值值 + bool DisplayBrightnessModel::UpdateBrightnessValueOfSlider(void) + { + BrightnessLevelView *p_BrightnessLevelView= BrightnessLevelView::GetInstance(); + if (p_BrightnessLevelView == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BrightnessLevelView::GetInstance fail!!"); + return false; + } + UISlider *slider = p_BrightnessLevelView->GetBrightnessControlView()->GetBrightnessControlViewSlider(); + if (slider == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "slider is nullptr!!"); + return false; + } + uint8_t value = ConfigModel::GetInstance()->GetBrightness(); + slider->SetValue(value); return true; } 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 21400b2e6..de9086bdf 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-30 09:14:38 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-06-07 19:55:47 + * @LastEditTime: 2024-06-18 14:11:36 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp */ #include "AppViewIDs.h" @@ -54,10 +54,7 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetRaiseToBrightnessState displayBrightnessView GetInstance fail"); return; } - if (value != false) - { - displayBrightnessView->SetRaiseToBrightnessCheckBoxButtonState(UICheckBox::UICheckBoxState::SELECTED); - } + displayBrightnessView->SetRaiseToBrightnessCheckBoxButtonState(value != false ? UICheckBox::UICheckBoxState::SELECTED : UICheckBox::UICheckBoxState::UNSELECTED); } /// @brief 根据value值设置哪个按钮被选中 @@ -157,6 +154,7 @@ namespace OHOS DisplayBrightnessView *p_DisplayBrightnessView = DisplayBrightnessView::GetInstance(); if (p_DisplayBrightnessView == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessView::GetInstance fail!!"); return false; } if (strcmp(view.GetViewId(), BRINGHTNESSCONTROLBUTTON_VIEW) == 0) @@ -193,7 +191,6 @@ namespace OHOS else if (strcmp(view.GetViewId(), DISPLAY_BRIGHTNESS_VIEW) == 0) { NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); - } DisplayBrightnessPresenter::X_DRAG_FLAG = false; } @@ -240,6 +237,7 @@ namespace OHOS */ bool ScreenDurationRadiobuttonOnChangeListener::OnChange(UICheckBox::UICheckBoxState state) { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ScreenDurationRadiobuttonOnChangeListener::OnChange"); if (state != UICheckBox::SELECTED) { return true; // 如果不是选中状态，无需处理 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 caaa16fc2..ffa0c8f74 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp @@ -2,19 +2,20 @@ #include "displaybrightness/include/DisplayBrightnessModel.h" #include "wearable_log.h" #include "ConfigModel.h" +#include "language/font/ui_resource_string.h" namespace OHOS { static DisplayBrightnessView *g_pDisplayBrightnessView{nullptr}; DisplayBrightnessView::DisplayBrightnessView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessView::DisplayBrightnessView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessView::DisplayBrightnessView"); g_pDisplayBrightnessView = this; } DisplayBrightnessView::~DisplayBrightnessView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessView::~DisplayBrightnessView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessView::~DisplayBrightnessView"); ClearAll(); g_pDisplayBrightnessView = nullptr; } @@ -79,9 +80,11 @@ namespace OHOS } DisplayBrightnessScrollView[DISPLAYBRIGHTNESSVIEW]->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); DisplayBrightnessScrollView[DISPLAYBRIGHTNESSVIEW]->SetViewId(DISPLAY_BRIGHTNESS_VIEW); - DisplayBrightnessScrollView[DISPLAYBRIGHTNESSVIEW]->SetScrollBlankSize(35); - DisplayBrightnessScrollView[DISPLAYBRIGHTNESSVIEW]->SetReboundSize(50); + DisplayBrightnessScrollView[DISPLAYBRIGHTNESSVIEW]->SetScrollBlankSize(75); + DisplayBrightnessScrollView[DISPLAYBRIGHTNESSVIEW]->SetReboundSize(35); DisplayBrightnessScrollView[DISPLAYBRIGHTNESSVIEW]->SetDirection(1); + DisplayBrightnessScrollView[DISPLAYBRIGHTNESSVIEW]->SetMaxScrollDistance(1000); + DisplayBrightnessScrollView[DISPLAYBRIGHTNESSVIEW]->SetThrowDrag(true); UIView::OnDragListener *draglistener = static_cast(DisplayBrightnessPresenter::GetInstance()); if (draglistener == nullptr) { @@ -105,13 +108,12 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DisplayBrightnessView::DisplayBrightnessTitleLabel new fail!"); return false; } - DisplayBrightnessTitleLabel->SetPosition(93, 52, 280, 40); + DisplayBrightnessTitleLabel->SetPosition(83, 52, 300, 35); DisplayBrightnessTitleLabel->SetStyle(STYLE_BACKGROUND_OPA, 0xff); DisplayBrightnessTitleLabel->SetStyle(STYLE_TEXT_FONT, 30); DisplayBrightnessTitleLabel->SetStyle(STYLE_LINE_HEIGHT, 35); // DisplayBrightnessTitleLabel->SetText("屏幕与亮度"); DisplayBrightnessTitleLabel->SetTextId(STR_SCREEN_AND_BRIGHTNESS); - DisplayBrightnessTitleLabel->SetRollSpeed(40); DisplayBrightnessTitleLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); DisplayBrightnessTitleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); DisplayBrightnessTitleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); @@ -134,8 +136,7 @@ namespace OHOS button->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); button->SetStyle(STYLE_BACKGROUND_OPA, 0xff); // button->SetImageSrc(buttonconfig.ImageSrc, buttonconfig.ImageSrc); - button->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xffffffff, UIButton::PRESSED); - button->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED); + button->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff000000, UIButton::PRESSED); button->SetOnClickListener(clickListener); return button; } @@ -187,8 +188,8 @@ namespace OHOS // label->SetText(labelconfig.text.c_str()); // 内容 label->SetTextId(labelconfig.textId); label->SetLineBreakMode(labelconfig.lineBreakMode); // 断行模式。 - //label->SetRollSpeed(40); - // label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + // label->SetRollSpeed(40); + // label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; } @@ -202,7 +203,7 @@ namespace OHOS .left = 90, .top = 153, .width = 250, - .height = 40, + .height = 35, .fontSize = 30, .lineHeigh = 35, //.text = "亮度调节", @@ -218,7 +219,7 @@ namespace OHOS /* -------------------------------------------------------------------------- */ labelconfig.top = 273; labelconfig.width = 180; - //labelconfig.text = "亮屏时长"; + // labelconfig.text = "亮屏时长"; labelconfig.textId = STR_SCREEN_ON_DURATION; ScreenDurationLabel = SetUpLabel(labelconfig); if (ScreenDurationLabel == nullptr) @@ -228,7 +229,7 @@ namespace OHOS } /* -------------------------------------------------------------------------- */ labelconfig.top = 393; - //labelconfig.text = "抬腕亮屏"; + // labelconfig.text = "抬腕亮屏"; labelconfig.textId = STR_RAISE_TO_WAKE; RaiseToBrightnessLabel = SetUpLabel(labelconfig); if (RaiseToBrightnessLabel == nullptr) @@ -382,15 +383,14 @@ namespace OHOS { return; } - if (!DisplayBrightnessModel::GetInstance()->RaiseToBrightnessCheckBoxButtonStatusInit()) + if (!DisplayBrightnessModel::GetInstance()->UpdateRaiseToBrightnessCheckBoxButtonStatus()) { return; } - if (!DisplayBrightnessModel::GetInstance()->SelectScreenDurationLabelInit()) + if (!DisplayBrightnessModel::GetInstance()->UpdateSelectScreenDurationLabel()) { return; } - initViewStatus = true; } /// @brief 获取抬腕亮屏按钮状态 @@ -528,6 +528,7 @@ namespace OHOS if (!initViewStatus) { DisplayAndBrightnessViewInit(); + initViewStatus = true; } RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::DisplayBrightnessPresenter::GetInstance(); RootView::GetInstance()->SetOnKeyActListener(keyactListener); @@ -553,7 +554,6 @@ namespace OHOS DisplayBrightnessScrollView[DISPLAYBRIGHTNESSVIEW]->Add(RaiseToBrightnessLabel); DisplayBrightnessScrollView[DISPLAYBRIGHTNESSVIEW]->Add(RaiseToBrightnessCheckBoxButton); RootView::GetInstance()->Add(DisplayBrightnessScrollView[DISPLAYBRIGHTNESSVIEW]); - container_ = DisplayBrightnessScrollView[DISPLAYBRIGHTNESSVIEW]; Draw(); } 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 e3f14d38a..ede47b861 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp @@ -2,6 +2,7 @@ #include "displaybrightness/include/DisplayBrightnessPresenter.h" #include "displaybrightness/include/DisplayBrightnessModel.h" #include "wearable_log.h" +#include "language/font/ui_resource_string.h" namespace OHOS { @@ -9,13 +10,13 @@ namespace OHOS ScreenDurationView::ScreenDurationView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScreenDurationView::ScreenDurationView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ScreenDurationView::ScreenDurationView"); g_pScreenDurationView = this; } ScreenDurationView::~ScreenDurationView() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScreenDurationView::~ScreenDurationView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ScreenDurationView::~ScreenDurationView"); ClearAll(); g_pScreenDurationView = nullptr; } @@ -80,9 +81,9 @@ namespace OHOS label->SetStyle(STYLE_TEXT_FONT, labelconfig.fontSize); // 字体大小 label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh); // 字体行高 // label->SetText(labelconfig.text); // 内容 - label->SetTextId(labelconfig.textId); // 内容 + label->SetTextId(labelconfig.textId); // 内容 label->SetLineBreakMode(labelconfig.lineBreakMode); // 断行模式。 - label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + // label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); return label; } @@ -112,9 +113,11 @@ namespace OHOS } ScreenDurationScrollView->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); ScreenDurationScrollView->SetViewId(SCREENDURATIONSCROLLVIEW); - ScreenDurationScrollView->SetScrollBlankSize(35); - ScreenDurationScrollView->SetReboundSize(50); + ScreenDurationScrollView->SetScrollBlankSize(75); + ScreenDurationScrollView->SetReboundSize(35); ScreenDurationScrollView->SetDirection(1); + ScreenDurationScrollView->SetMaxScrollDistance(1000); + ScreenDurationScrollView->SetThrowDrag(true); UIView::OnDragListener *draglistener = static_cast(DisplayBrightnessPresenter::GetInstance()); if (draglistener == nullptr) { @@ -155,10 +158,10 @@ namespace OHOS { // 创建ScreenDurationTitleLabel LabelConfig labelconfig = { - .left = 93, + .left = 83, .top = 52, - .width = 280, - .height = 40, + .width = 300, + .height = 35, .fontSize = 30, .lineHeigh = 35, //.text = "亮屏时长", @@ -172,13 +175,18 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScreenDurationView::SetUpScreenDurationViewLabel is nullptr!"); return false; } + ScreenDurationTitleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); // 创建ScreenDurationLabel labelconfig = { - .left = 99, + .left = 103, + .top = 153, + .width = 210, + .height = 35, .fontSize = 30, .lineHeigh = 35, - .lineBreakMode = UILabel::LINE_BREAK_ADAPT, + .textId = STR_SCREEN_ON_DURATION, + .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, }; // const char *durations[DURATIONS] = {"5秒", "10秒", "15秒", "30秒", "60秒", "300秒"}; @@ -187,7 +195,6 @@ namespace OHOS for (int i = 0; i < DURATIONS; i++) { labelconfig.top = 153 + (i * 120); - // labelconfig.text = durations[i]; labelconfig.textId = durations[i]; ScreenDurationLabel[i] = SetUpLabel(labelconfig); if (ScreenDurationLabel[i] == nullptr) @@ -195,6 +202,7 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ScreenDurationView::ScreenDurationLabel[%d] is nullptr!", i); return false; } + ScreenDurationLabel[i]->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER); } return true; @@ -276,7 +284,7 @@ namespace OHOS return nullptr; } - if (!DisplayBrightnessModel::GetInstance()->ScreenDurationRadioButtonSlectStatusInit()) + if (!DisplayBrightnessModel::GetInstance()->UpdateScreenDurationRadioButtonSlectStatus()) { return nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/themestyle/include/ThemeStyleModel.h b/code/sdk/application/wearable/fd230app/nativeui/themestyle/include/ThemeStyleModel.h index de5fb1c39..2b5f3371c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/themestyle/include/ThemeStyleModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/themestyle/include/ThemeStyleModel.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-06-14 09:40:13 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-06-14 18:28:15 + * @LastEditTime: 2024-06-18 14:42:57 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/themestyle/include/ThemeStyleModel.h */ #ifndef SET_THEMESTYLE_MODEL_H @@ -56,7 +56,6 @@ namespace OHOS virtual ~ThemeStyleModel(); ThemeStyleModel(const ThemeStyleModel &) = delete; ThemeStyleModel &operator=(const ThemeStyleModel &) = delete; - uint16_t ThemeStyleId; }; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleModel.cpp index 87fbf7702..6da8835c8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleModel.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-06-07 09:21:47 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-06-14 19:14:47 + * @LastEditTime: 2024-06-18 14:42:50 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/set_desktop/src/ThemeStyleModel.cpp */ @@ -56,7 +56,6 @@ namespace OHOS { // 根据映射设置显示样式值 (void)UtilsSetValue(THEMESTYLE_KEY, ThemeStyleMap.at(style).c_str()); - SetSelectThemeStyleId(style); } else { @@ -67,13 +66,7 @@ namespace OHOS //获取选中的样式Id uint16_t ThemeStyleModel::GetSelectThemeStyleId(void) { - return ThemeStyleId; - } - - //设置选中的样式Id - void ThemeStyleModel::SetSelectThemeStyleId(uint16_t Id) - { - ThemeStyleId = Id; + return GetAppListDisplayStyle(); } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/uiservice/include/ui_service.h b/code/sdk/application/wearable/fd230app/nativeui/uiservice/include/ui_service.h index 002a7f6d3..ac4308a52 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/uiservice/include/ui_service.h +++ b/code/sdk/application/wearable/fd230app/nativeui/uiservice/include/ui_service.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-06-12 11:44:04 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-06-17 17:43:25 + * @LastEditTime: 2024-06-18 17:08:49 * @FilePath: /FD230/code/sdk/application/wearable/nativeapp/nativeui/uiservice/include/ui_service.h */ /* @@ -60,6 +60,9 @@ typedef enum { SCREEN_OFF_ENABLE_TO_UI, UI_ADD_SLEEP_VETO, UI_RM_SLEEP_VETO, + UI_UPDATE_SCREEN_DURATION, //更新亮屏时长 + UI_UPDATE_RAISETOBRIGHTNESS,//更新抬腕亮屏 + UI_UPDATE_BRIGHTNESS_VALUE, //更新亮度值 } UiServiceMsgId; #define BUNDLE_NAME_LEN 128 diff --git a/code/sdk/application/wearable/fd230app/nativeui/uiservice/src/ui_service.cpp b/code/sdk/application/wearable/fd230app/nativeui/uiservice/src/ui_service.cpp index 6320d0496..a8e565d9a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/uiservice/src/ui_service.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/uiservice/src/ui_service.cpp @@ -13,6 +13,10 @@ * limitations under the License. */ +#include +#include +#include +#include "displaybrightness/include/DisplayBrightnessModel.h" #include "uiservice/include/ui_service.h" #include "wearable_log.h" #include "samgr_lite.h" @@ -63,6 +67,54 @@ const int DATA_DIST_MAIL_LENGTH = 10; const int BYTE_OFFSET = 8; static uint32_t g_interval = 5; +/* -------------------------------------------------------------------------- */ +// 消息处理程序的函数指针类型 +typedef void (*MsgHandlerFunc)(Request *); +// 定义一个结构来保存消息处理程序 +typedef struct +{ + int msgId; + MsgHandlerFunc handler; +} MsgHandlerEntry; + +// 消息处理程序的函数原型 +static void HandleJSInstallSuccess(Request *request); +static void HandleJSUninstallSuccess(Request *request); +static void HandlePhoneConnected(Request *request); +static void HandlePhoneDisconnected(Request *request); +static void HandleEarphoneConnected(Request *request); +static void HandleEarphoneDisconnected(Request *request); +static void HandleBluetoothConnected(Request *request); +static void HandleBluetoothDisconnected(Request *request); +static void HandleScreenTurnOn(Request *request); +static void HandleScreenTurnOff(Request *request); +static void HandleScreenOffEnable(Request *request); +static void HandleAddSleepVeto(Request *request); +static void HandleRemoveSleepVeto(Request *request); +static void HandleUpdateScreenDuration(Request *request); +static void HandleUpdateRaiseToBrightness(Request *request); +static void HandleUpdateBrightnessValue(Request *request); + +// 消息处理程序项数组(每个消息类型对应一个处理函数，函数名以 Handle 开头) +MsgHandlerEntry msgHandlers[] = { + {JS_INSTALL_SUCESS_TO_UI, HandleJSInstallSuccess}, + {JS_UNINSTALL_SUCESS_TO_UI, HandleJSUninstallSuccess}, + {PHONE_CONNECTED_TO_UI, HandlePhoneConnected}, + {PHONE_DISCONNECTED_TO_UI, HandlePhoneDisconnected}, + {EARPHONE_CONNECTED_TO_UI, HandleEarphoneConnected}, + {EARPHONE_DISCONNECTED_TO_UI, HandleEarphoneDisconnected}, + {BT_CONNECTED_TO_UI, HandleBluetoothConnected}, + {BT_DISCONNECTED_TO_UI, HandleBluetoothDisconnected}, + {SCREEN_TURN_ON_TO_UI, HandleScreenTurnOn}, + {SCREEN_TURN_OFF_TO_UI, HandleScreenTurnOff}, + {SCREEN_OFF_ENABLE_TO_UI, HandleScreenOffEnable}, + {UI_ADD_SLEEP_VETO, HandleAddSleepVeto}, + {UI_RM_SLEEP_VETO, HandleRemoveSleepVeto}, + {UI_UPDATE_SCREEN_DURATION, HandleUpdateScreenDuration}, + {UI_UPDATE_RAISETOBRIGHTNESS, HandleUpdateRaiseToBrightness}, + {UI_UPDATE_BRIGHTNESS_VALUE, HandleUpdateBrightnessValue}, + }; +/* -------------------------------------------------------------------------- */ static void ScreenTurnOn(Request *request) { if (OHOS::HealthModel::GetInstance()->GetBriScrStatus() == 1) { @@ -137,6 +189,8 @@ BOOL ServiceInitialize(Service *service, Identity identity) void ServiceMsgProcess(Request *request) { + #if 0 + WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "UiServiceMsgId = %d",request->msgId); switch (request->msgId) { case JS_INSTALL_SUCESS_TO_UI: case JS_UNINSTALL_SUCESS_TO_UI: @@ -184,8 +238,35 @@ void ServiceMsgProcess(Request *request) case UI_RM_SLEEP_VETO: uapi_pm_remove_sleep_veto(PM_ID_SCREEN); break; + case UI_UPDATE_SCREEN_DURATION: + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&OHOS::DisplayBrightnessModel::UpdateSelectScreenDurationLabel, OHOS::DisplayBrightnessModel::GetInstance())); + break; + case UI_UPDATE_RAISETOBRIGHTNESS: + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&OHOS::DisplayBrightnessModel::UpdateRaiseToBrightnessCheckBoxButtonStatus, OHOS::DisplayBrightnessModel::GetInstance())); + break; + case UI_UPDATE_BRIGHTNESS_VALUE: + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&OHOS::DisplayBrightnessModel::UpdateBrightnessValueOfSlider, OHOS::DisplayBrightnessModel::GetInstance())); + break; } SAMGR_FreeRequestMsg(request); + #endif + /* -------------------------------------------------------------------------- */ + WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "UiServiceMsgId = %d",request->msgId); + int numHandlers = sizeof(msgHandlers) / sizeof(msgHandlers[0]); + for (int i = 0; i < numHandlers; ++i) + { + if (msgHandlers[i].msgId == request->msgId) + { + msgHandlers[i].handler(request); + break; + } + } + //释放请求消息 + SAMGR_FreeRequestMsg(request); + /* -------------------------------------------------------------------------- */ } BOOL ServiceMessageHandle(Service *service, Request *request) @@ -206,6 +287,7 @@ TaskConfig GetServiceTaskConfig(Service *service) return config; } +//发送msg static int32_t SendMsg(int32_t msgId, uint32_t msgValue, void *data, int32_t dataLen) { Request *request = SAMGR_AllocRequestMsg(0, PLATFORM_CORE, UI_SVR_ID, dataLen); @@ -228,6 +310,7 @@ static int32_t SendMsg(int32_t msgId, uint32_t msgValue, void *data, int32_t dat return TRUE; } +//发送msg给ui服务 void SendMsgToUIService(int32_t msgId, uint32_t msgValue, void *data, int32_t dataLen) { UiServiceFeatureApi *comApi = nullptr; @@ -245,6 +328,125 @@ void SendMsgToUIService(int32_t msgId, uint32_t msgValue, void *data, int32_t da comApi->Release((IUnknown *)comApi); } +/* -------------------------------------------------------------------------- */ +void HandleJSInstallSuccess(Request *request) +{ + WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "bms msg_id = %d bundleName = %s", + request->msgId, ((BundleData *)request->data)->bundleName); + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&OHOS::ApplistModel::ApplistUpdate, &OHOS::ApplistModel::GetInstance())); +} + +void HandleJSUninstallSuccess(Request *request) +{ + WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "bms msg_id = %d bundleName = %s", + request->msgId, ((BundleData *)request->data)->bundleName); + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&OHOS::ApplistModel::ApplistUpdate, &OHOS::ApplistModel::GetInstance())); +} + +//处理手机连接成功 +void HandlePhoneConnected(Request *request) +{ + WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "HandlePhoneConnectStatus"); + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&OHOS::SettingModel::UpdatePhoneConnectStatus, &OHOS::SettingModel::GetInstance(), true)); +} + +//处理手机断开连接 +void HandlePhoneDisconnected(Request *request) +{ + WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "HandlePhoneDisconnected"); + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&OHOS::SettingModel::UpdatePhoneConnectStatus, &OHOS::SettingModel::GetInstance(), false)); +} + +//处理耳机连接成功 +void HandleEarphoneConnected(Request *request) +{ + WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "HandleEarphoneConnected"); + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&OHOS::SettingModel::UpdateEarPhoneConnectStatus, &OHOS::SettingModel::GetInstance(), true)); +} + +//处理耳机断开连接 +void HandleEarphoneDisconnected(Request *request) +{ + WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "HandleEarphoneConnected"); + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&OHOS::SettingModel::UpdateEarPhoneConnectStatus, &OHOS::SettingModel::GetInstance(), false)); +} + +//处理蓝牙连接成功 +void HandleBluetoothConnected(Request *request) +{ + WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "HandleBluetoothConnected"); + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&OHOS::SettingModel::UpdateBlueToothConnectStatus, &OHOS::SettingModel::GetInstance(), true)); +} + +//处理蓝牙断开连接 +void HandleBluetoothDisconnected(Request *request) +{ + WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "HandleBluetoothDisconnected"); + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&OHOS::SettingModel::UpdateBlueToothConnectStatus, &OHOS::SettingModel::GetInstance(), false)); +} + +void HandleScreenTurnOn(Request *request) +{ + WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "HandleScreenTurnOn"); + ScreenTurnOn(request); +} + +void HandleScreenTurnOff(Request *request) +{ + WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "HandleScreenTurnOff"); + ScreenTurnOff(request); +} + +void HandleScreenOffEnable(Request *request) +{ + WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "HandleScreenOffEnable"); + ScreenOffEnable(request); +} + +void HandleAddSleepVeto(Request *request) +{ + WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "HandleAddSleepVeto"); + uapi_pm_add_sleep_veto(PM_ID_SCREEN); +} + +void HandleRemoveSleepVeto(Request *request) +{ + WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "HandleRemoveSleepVeto"); + uapi_pm_remove_sleep_veto(PM_ID_SCREEN); +} + +//处理更新选择的亮屏时长标签内容 +void HandleUpdateScreenDuration(Request *request) +{ + WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "HandleUpdateRaiseToBrightness"); + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&OHOS::DisplayBrightnessModel::UpdateSelectScreenDurationLabel, OHOS::DisplayBrightnessModel::GetInstance())); +} + +//处理更新抬腕亮屏按钮状态 +void HandleUpdateRaiseToBrightness(Request *request) +{ + WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "HandleUpdateRaiseToBrightness"); + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&OHOS::DisplayBrightnessModel::UpdateRaiseToBrightnessCheckBoxButtonStatus, OHOS::DisplayBrightnessModel::GetInstance())); +} + +//处理更新亮度条的亮度值值 +void HandleUpdateBrightnessValue(Request *request) +{ + WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "HandleUpdateBrightnessValue"); + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&OHOS::DisplayBrightnessModel::UpdateBrightnessValueOfSlider, OHOS::DisplayBrightnessModel::GetInstance())); +} +/* -------------------------------------------------------------------------- */ #ifdef __cplusplus } #endif diff --git a/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherModel.cpp index 142dddac0..fe5a43b95 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherModel.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-08 18:40:09 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-06-15 17:50:19 + * @LastEditTime: 2024-06-18 11:21:26 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherModel.cpp */ #include "weather/include/WeatherModel.h" @@ -146,7 +146,8 @@ namespace OHOS // 获取天气图片 std::string WeatherModel::GetWeatherImage() { - int index = Weather_data_t_now.iconNight; + //int index = Weather_data_t_now.iconNight;//夜晚天气图标 + int index = Weather_data_seven_data[0].iconDay;//白天天气图标 WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "iconNight:%d", index); return weather65x65[index]; } diff --git a/code/sdk/application/wearable/service/ble_service/blemoder/CMakeLists.txt b/code/sdk/application/wearable/service/ble_service/blemoder/CMakeLists.txt index b4c86931d..1b9bc4d1b 100644 --- a/code/sdk/application/wearable/service/ble_service/blemoder/CMakeLists.txt +++ b/code/sdk/application/wearable/service/ble_service/blemoder/CMakeLists.txt @@ -20,6 +20,7 @@ ${ROOT_DIR}/application/wearable/fd230app/nativeui/language ${ROOT_DIR}/application/wearable/fd230app/nativeui/traing/training_card/include ${ROOT_DIR}/application/wearable/fd230app/nativeui/config/include ${ROOT_DIR}/application/wearable/fd230app/nativeui/traing/include +${ROOT_DIR}/application/wearable/fd230app/nativeui/uiservice/include #${ROOT_DIR}/application/wearable/fd230app/nativeui/alarm/include ${ROOT_DIR}/application/wearable/fd230app/nativeui/alarmclockmanage/include ${ROOT_DIR}/application/wearable/fd230app/nativeui/alarmclocktimerconfig/include diff --git a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp index 5f7eeff7f..3d36c30dd 100644 --- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp +++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp @@ -17,7 +17,8 @@ #include "health_service.h" #include "phoneaddressmodel.h" #include "LanguageInit.h" -#include "ConfigModel.h" +#include "ConfigModel.h" +#include "uiservice/include/ui_service.h" // #include "TraingCardPresenter.h" #ifdef FD230 @@ -714,7 +715,14 @@ void set_traning_heart_max(uint8_t data) void set_brigthness(uint8_t data) //设置屏幕亮度 { OHOS::ConfigModel *p_ConfigModel = OHOS::ConfigModel::GetInstance(); + const uint8_t minbrightness =51; + const uint8_t maxbrightness =0xff; + if(data<=minbrightness) + data = minbrightness; + else if(data >= maxbrightness) + data = maxbrightness; p_ConfigModel->SetBrightness(data); + SendMsgToUIService(UI_UPDATE_BRIGHTNESS_VALUE,0,nullptr,0); return; } void Set_DmpChangeMode(int state) @@ -739,6 +747,7 @@ void set_ScreenDuration(int data) //设置亮屏时长 { OHOS::ConfigModel *p_ConfigModel = OHOS::ConfigModel::GetInstance(); p_ConfigModel->SetScreenDuration(data); + SendMsgToUIService(UI_UPDATE_SCREEN_DURATION,0,nullptr,0); return; } @@ -752,6 +761,7 @@ void Set_RaiseToWake(bool value) //抬婉亮屏开关 { OHOS::ConfigModel *p_ConfigModel = OHOS::ConfigModel::GetInstance(); p_ConfigModel->SetRaiseToWake(value); + SendMsgToUIService(UI_UPDATE_RAISETOBRIGHTNESS,0,nullptr,0); return; } -- 2.17.1