From ecb3a48290b24c8e2aad5218297d8e56916ba9b4 Mon Sep 17 00:00:00 2001 From: aqxyjay Date: Tue, 30 Aug 2022 17:09:17 +0800 Subject: [PATCH] refactor: rename power setting helper and observer Signed-off-by: aqxyjay --- .../native/src/display_power_mgr_service.cpp | 20 ++++++++-------- service/native/src/screen_controller.cpp | 24 +++++++++---------- .../src/display_power_mgr_brightness_test.cpp | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/service/native/src/display_power_mgr_service.cpp b/service/native/src/display_power_mgr_service.cpp index 8c97653..d649405 100644 --- a/service/native/src/display_power_mgr_service.cpp +++ b/service/native/src/display_power_mgr_service.cpp @@ -26,14 +26,14 @@ #include "watchdog.h" #include "display_log.h" #include "display_param_helper.h" -#include "power_setting_helper.h" +#include "setting_provider.h" namespace OHOS { namespace DisplayPowerMgr { using namespace OHOS::PowerMgr; namespace { constexpr const char* DISPLAY_SERVICE_NAME = "DisplayPowerManagerService"; -sptr g_autoBrightnessObserver; +sptr g_autoBrightnessObserver; } const uint32_t DisplayPowerMgrService::BRIGHTNESS_MIN = DisplayParamHelper::GetInstance().GetMinBrightness(); const uint32_t DisplayPowerMgrService::BRIGHTNESS_DEFAULT = DisplayParamHelper::GetInstance().GetDefaultBrightness(); @@ -114,10 +114,10 @@ void DisplayPowerMgrService::RegisterSettingAutoBrightnessObserver() DISPLAY_HILOGD(FEAT_BRIGHTNESS, "setting auto brightness observer is already registered"); return; } - PowerSettingHelper& helper = PowerSettingHelper::GetInstance(DISPLAY_MANAGER_SERVICE_ID); - PowerSettingObserver::UpdateFunc updateFunc = [&](const std::string& key) { AutoBrightnessSettingUpdateFunc(key); }; - g_autoBrightnessObserver = helper.CreateObserver(SETTING_AUTO_ADJUST_BRIGHTNESS_KEY, updateFunc); - ErrCode ret = helper.RegisterObserver(g_autoBrightnessObserver); + SettingProvider& provider = SettingProvider::GetInstance(DISPLAY_MANAGER_SERVICE_ID); + SettingObserver::UpdateFunc updateFunc = [&](const std::string& key) { AutoBrightnessSettingUpdateFunc(key); }; + g_autoBrightnessObserver = provider.CreateObserver(SETTING_AUTO_ADJUST_BRIGHTNESS_KEY, updateFunc); + ErrCode ret = provider.RegisterObserver(g_autoBrightnessObserver); if (ret != ERR_OK) { DISPLAY_HILOGW(FEAT_BRIGHTNESS, "register setting brightness observer failed, ret=%{public}d", ret); g_autoBrightnessObserver = nullptr; @@ -126,9 +126,9 @@ void DisplayPowerMgrService::RegisterSettingAutoBrightnessObserver() void DisplayPowerMgrService::AutoBrightnessSettingUpdateFunc(const std::string& key) { - PowerSettingHelper& helper = PowerSettingHelper::GetInstance(DISPLAY_MANAGER_SERVICE_ID); + SettingProvider& provider = SettingProvider::GetInstance(DISPLAY_MANAGER_SERVICE_ID); int32_t value; - ErrCode ret = helper.GetIntValue(key, value); + ErrCode ret = provider.GetIntValue(key, value); if (ret != ERR_OK) { DISPLAY_HILOGW(FEAT_BRIGHTNESS, "get setting auto brightness failed key=%{public}s, ret=%{public}d", key.c_str(), ret); @@ -143,8 +143,8 @@ void DisplayPowerMgrService::UnregisterSettingAutoBrightnessObserver() DISPLAY_HILOGD(FEAT_BRIGHTNESS, "g_autoBrightnessObserver is nullptr, no need to unregister"); return; } - PowerSettingHelper& helper = PowerSettingHelper::GetInstance(DISPLAY_MANAGER_SERVICE_ID); - ErrCode ret = helper.UnregisterObserver(g_autoBrightnessObserver); + SettingProvider& provider = SettingProvider::GetInstance(DISPLAY_MANAGER_SERVICE_ID); + ErrCode ret = provider.UnregisterObserver(g_autoBrightnessObserver); if (ret != ERR_OK) { DISPLAY_HILOGW(FEAT_BRIGHTNESS, "unregister setting auto brightness observer failed, ret=%{public}d", ret); } diff --git a/service/native/src/screen_controller.cpp b/service/native/src/screen_controller.cpp index ba5f381..e63279d 100644 --- a/service/native/src/screen_controller.cpp +++ b/service/native/src/screen_controller.cpp @@ -19,7 +19,7 @@ #include "refbase.h" #include "display_power_mgr_service.h" #include "display_param_helper.h" -#include "power_setting_helper.h" +#include "setting_provider.h" #include "system_ability_definition.h" #include "display_common.h" #include "display_log.h" @@ -30,7 +30,7 @@ using namespace OHOS::PowerMgr; namespace OHOS { namespace DisplayPowerMgr { namespace { -sptr g_brightnessObserver; +sptr g_brightnessObserver; } ScreenController::ScreenController(uint32_t displayId, const shared_ptr& handler) @@ -292,9 +292,9 @@ bool ScreenController::UpdateBrightness(uint32_t value, uint32_t gradualDuration uint32_t ScreenController::GetSettingBrightness(const std::string& key) const { - PowerSettingHelper& helper = PowerSettingHelper::GetInstance(DISPLAY_MANAGER_SERVICE_ID); + SettingProvider& provider = SettingProvider::GetInstance(DISPLAY_MANAGER_SERVICE_ID); int32_t value; - ErrCode ret = helper.GetIntValue(key, value); + ErrCode ret = provider.GetIntValue(key, value); if (ret != ERR_OK) { DISPLAY_HILOGW(FEAT_BRIGHTNESS, "get setting brightness failed, return cachedBrightness_=%{public}u,"\ " key=%{public}s, ret=%{public}d", cachedSettingBrightness_, key.c_str(), ret); @@ -311,8 +311,8 @@ void ScreenController::SetSettingBrightness(uint32_t value) return; } cachedSettingBrightness_ = settingBrightness; - PowerSettingHelper& helper = PowerSettingHelper::GetInstance(DISPLAY_MANAGER_SERVICE_ID); - ErrCode ret = helper.PutIntValue(SETTING_BRIGHTNESS_KEY, static_cast(value)); + SettingProvider& provider = SettingProvider::GetInstance(DISPLAY_MANAGER_SERVICE_ID); + ErrCode ret = provider.PutIntValue(SETTING_BRIGHTNESS_KEY, static_cast(value)); if (ret != ERR_OK) { DISPLAY_HILOGW(FEAT_BRIGHTNESS, "set setting brightness failed, ret=%{public}d", ret); } @@ -338,10 +338,10 @@ void ScreenController::RegisterSettingBrightnessObserver() DISPLAY_HILOGD(FEAT_BRIGHTNESS, "setting brightness observer is already registered"); return; } - PowerSettingHelper& helper = PowerSettingHelper::GetInstance(DISPLAY_MANAGER_SERVICE_ID); - PowerSettingObserver::UpdateFunc updateFunc = [&](const std::string& key) { BrightnessSettingUpdateFunc(key); }; - g_brightnessObserver = helper.CreateObserver(SETTING_BRIGHTNESS_KEY, updateFunc); - ErrCode ret = helper.RegisterObserver(g_brightnessObserver); + SettingProvider& provider = SettingProvider::GetInstance(DISPLAY_MANAGER_SERVICE_ID); + SettingObserver::UpdateFunc updateFunc = [&](const std::string& key) { BrightnessSettingUpdateFunc(key); }; + g_brightnessObserver = provider.CreateObserver(SETTING_BRIGHTNESS_KEY, updateFunc); + ErrCode ret = provider.RegisterObserver(g_brightnessObserver); if (ret != ERR_OK) { DISPLAY_HILOGW(FEAT_BRIGHTNESS, "register setting brightness observer failed, ret=%{public}d", ret); g_brightnessObserver = nullptr; @@ -363,8 +363,8 @@ void ScreenController::UnregisterSettingBrightnessObserver() DISPLAY_HILOGD(FEAT_BRIGHTNESS, "g_brightnessObserver is nullptr, no need to unregister"); return; } - PowerSettingHelper& helper = PowerSettingHelper::GetInstance(DISPLAY_MANAGER_SERVICE_ID); - ErrCode ret = helper.UnregisterObserver(g_brightnessObserver); + SettingProvider& provider = SettingProvider::GetInstance(DISPLAY_MANAGER_SERVICE_ID); + ErrCode ret = provider.UnregisterObserver(g_brightnessObserver); if (ret != ERR_OK) { DISPLAY_HILOGW(FEAT_BRIGHTNESS, "unregister setting brightness observer failed, ret=%{public}d", ret); } diff --git a/test/unittest/common/native/src/display_power_mgr_brightness_test.cpp b/test/unittest/common/native/src/display_power_mgr_brightness_test.cpp index a4baa4a..2228abe 100644 --- a/test/unittest/common/native/src/display_power_mgr_brightness_test.cpp +++ b/test/unittest/common/native/src/display_power_mgr_brightness_test.cpp @@ -15,7 +15,7 @@ #include #include "display_power_mgr_client.h" -#include "power_setting_helper.h" +#include "setting_provider.h" #include "system_ability_definition.h" #include "display_log.h" -- Gitee