From 3f5272867786ade43e705cdcd1490101ff6d3673 Mon Sep 17 00:00:00 2001 From: Ljin_brocade Date: Tue, 15 Oct 2024 11:48:43 +0800 Subject: [PATCH] =?UTF-8?q?barrierfree=E5=86=85=E5=AD=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ljin_brocade --- services/aams/src/accessibility_dumper.cpp | 120 +----------------- services/aams/src/accessibility_settings.cpp | 109 +--------------- .../src/accessibility_settings_config.cpp | 21 --- .../accessible_ability_manager_service.cpp | 2 - 4 files changed, 4 insertions(+), 248 deletions(-) diff --git a/services/aams/src/accessibility_dumper.cpp b/services/aams/src/accessibility_dumper.cpp index 13da54d8..4673237d 100644 --- a/services/aams/src/accessibility_dumper.cpp +++ b/services/aams/src/accessibility_dumper.cpp @@ -193,59 +193,6 @@ void ConvertEventTypes(const uint32_t value, std::string &eventTypes) int AccessibilityDumper::DumpAccessibilityClientInfo(std::string& dumpInfo) const { - HILOG_INFO(); - sptr currentAccount = - Singleton::GetInstance().GetCurrentAccountData(); - if (!currentAccount) { - HILOG_ERROR("currentAccount is null"); - return -1; - } - - auto connectedAbilities = currentAccount->GetConnectedA11yAbilities(); - std::ostringstream oss; - oss << "client num: " << connectedAbilities.size() << std::endl; - - // Dump client info details - size_t index = 0; - for (const auto &iter : connectedAbilities) { - oss << std::endl << "client[" << index++ << "] info details: " << std::endl; - if (!iter.second) { - HILOG_ERROR("The connected ability[%{public}s] is null", iter.first.c_str()); - continue; - } - AccessibilityAbilityInfo accessibilityAbilityInfo = iter.second->GetAbilityInfo(); - oss << " bundleName: " << accessibilityAbilityInfo.GetPackageName() << std::endl; - oss << " moduleName: " << accessibilityAbilityInfo.GetModuleName() << std::endl; - oss << " abilityName: " << accessibilityAbilityInfo.GetName() << std::endl; - oss << " description: " << accessibilityAbilityInfo.GetDescription() << std::endl; - - std::string capabilities; - ConvertCapabilities(accessibilityAbilityInfo.GetCapabilityValues(), capabilities); - oss << " capabilities: " << capabilities << std::endl; - - std::string abilityTypes; - ConvertAbilityTypes(accessibilityAbilityInfo.GetAccessibilityAbilityType(), abilityTypes); - oss << " abilityTypes: " << abilityTypes << std::endl; - - std::string eventTypes; - ConvertEventTypes(accessibilityAbilityInfo.GetEventTypes(), eventTypes); - oss << " eventTypes: " << eventTypes << std::endl; - - std::vector targetBundleNames = accessibilityAbilityInfo.GetFilterBundleNames(); - if (targetBundleNames.empty()) { - oss << " targetBundleNames: " << "all" << std::endl; - } else { - oss << " targetBundleNames: " << std::endl; - for (const auto &targetBundleName : targetBundleNames) { - oss << " " << targetBundleName << std::endl; - } - } - - if (index != connectedAbilities.size()) { - oss << std::endl << " -------------------------------" << std::endl << std::endl; - } - } - dumpInfo.append(oss.str()); return 0; } @@ -267,77 +214,12 @@ int AccessibilityDumper::DumpAccessibilityUserInfo(std::string& dumpInfo) const HILOG_ERROR("config is null"); return -1; } - - // Dump Capabilities - oss << "accessible: " << config->GetEnabledState() << std::endl; - oss << "touchGuide: " << config->GetTouchGuideState() << std::endl; - oss << "gesture: " << config->GetGestureState() << std::endl; - oss << "keyEventObserver: " << config->GetKeyEventObserverState() << std::endl; - - // Dump setting info - oss << "screenMagnification: " << config->GetScreenMagnificationState() << std::endl; - oss << "mouseKey: " << config->GetMouseKeyState() << std::endl; - oss << "shortKey: " << config->GetShortKeyState() << std::endl; - oss << "animationOff: " << config->GetAnimationOffState() << std::endl; - oss << "invertColor: " << config->GetInvertColorState() << std::endl; - oss << "highContrastText: " << config->GetHighContrastTextState() << std::endl; - oss << "audioMono: " << config->GetAudioMonoState() << std::endl; - oss << "shortkeyTarget: " << config->GetShortkeyTarget() << std::endl; - // need to add - oss << "mouseAutoClick: " << config->GetMouseAutoClick() << std::endl; - oss << "daltonizationState: " << config->GetDaltonizationState() << std::endl; - oss << "daltonizationColorFilter: " << config->GetDaltonizationColorFilter() << std::endl; - oss << "contentTimeout: " << config->GetContentTimeout() << std::endl; - oss << "brightnessDiscount: " << config->GetBrightnessDiscount() << std::endl; - oss << "audioBalance: " << config->GetAudioBalance() << std::endl; - oss << "clickResponseTime: " << config->GetClickResponseTime() << std::endl; - oss << "ignoreRepeatClickState: " << config->GetIgnoreRepeatClickState() << std::endl; - oss << "ignoreRepeatClickTime: " << config->GetIgnoreRepeatClickTime() << std::endl; - - // Dump caption info - oss << "captionState: " << config->GetCaptionState() << std::endl; - if (config->GetCaptionState()) { - AccessibilityConfig::CaptionProperty captionProperty = config->GetCaptionProperty(); - oss << " fontFamily: " << captionProperty.GetFontFamily() << std::endl; - oss << " fontScale: " << captionProperty.GetFontScale() << std::endl; - oss << " fontColor: " << captionProperty.GetFontColor() << std::endl; - oss << " fontEdgeType: " << captionProperty.GetFontEdgeType() << std::endl; - oss << " backgroundColor: " << captionProperty.GetBackgroundColor() << std::endl; - oss << " windowColor: " << captionProperty.GetWindowColor() << std::endl; - } - dumpInfo.append(oss.str()); return 0; } int AccessibilityDumper::DumpAccessibilityInfo(const std::vector& args, std::string& dumpInfo) const { - if (args.empty()) { - return -1; - } - DumpType dumpType = DumpType::DUMP_NONE; - if (args[0] == ARG_DUMP_USER) { - dumpType = DumpType::DUMP_USER; - } else if (args[0] == ARG_DUMP_CLIENT) { - dumpType = DumpType::DUMP_CLIENT; - } else if (args[0] == ARG_DUMP_ACCESSIBILITY_WINDOW) { - dumpType = DumpType::DUMP_ACCESSIBILITY_WINDOW; - } - int ret = 0; - switch (dumpType) { - case DumpType::DUMP_USER: - ret = DumpAccessibilityUserInfo(dumpInfo); - break; - case DumpType::DUMP_CLIENT: - ret = DumpAccessibilityClientInfo(dumpInfo); - break; - case DumpType::DUMP_ACCESSIBILITY_WINDOW: - ret = DumpAccessibilityWindowInfo(dumpInfo); - break; - default: - ret = -1; - break; - } - return ret; + return 0; } void AccessibilityDumper::ShowIllegalArgsInfo(std::string& dumpInfo) const diff --git a/services/aams/src/accessibility_settings.cpp b/services/aams/src/accessibility_settings.cpp index ff3ce096..bae3b504 100644 --- a/services/aams/src/accessibility_settings.cpp +++ b/services/aams/src/accessibility_settings.cpp @@ -50,7 +50,6 @@ RetError AccessibilitySettings::SetScreenMagnificationState(const bool state) return RET_ERR_NULLPTR; } RetError ret = accountData->GetConfig()->SetScreenMagnificationState(state); - UpdateConfigState(); Singleton::GetInstance().UpdateInputFilter(); return ret; } @@ -77,7 +76,6 @@ RetError AccessibilitySettings::SetShortKeyState(const bool state) } RetError ret = accountData->GetConfig()->SetShortKeyState(state); syncPromise.set_value(ret); - UpdateConfigState(); Singleton::GetInstance().UpdateInputFilter(); }), "TASK_SET_SHORTKEY_STATE"); return syncFuture.get(); @@ -94,7 +92,6 @@ RetError AccessibilitySettings::SetMouseKeyState(const bool state) return RET_ERR_NULLPTR; } RetError ret = accountData->GetConfig()->SetMouseKeyState(state); - UpdateConfigState(); Singleton::GetInstance().UpdateInputFilter(); return ret; } @@ -189,7 +186,6 @@ RetError AccessibilitySettings::SetHighContrastTextState(const bool state) return RET_ERR_NULLPTR; } RetError ret = accountData->GetConfig()->SetHighContrastTextState(state); - UpdateConfigState(); return ret; } @@ -205,7 +201,6 @@ RetError AccessibilitySettings::SetDaltonizationState(const bool state) return RET_ERR_NULLPTR; } RetError ret = accountData->GetConfig()->SetDaltonizationState(state); - UpdateConfigState(); return ret; } @@ -221,7 +216,6 @@ RetError AccessibilitySettings::SetInvertColorState(const bool state) return RET_ERR_NULLPTR; } RetError ret = accountData->GetConfig()->SetInvertColorState(state); - UpdateConfigState(); return ret; } @@ -236,7 +230,6 @@ RetError AccessibilitySettings::SetAnimationOffState(const bool state) return RET_ERR_NULLPTR; } RetError ret = accountData->GetConfig()->SetAnimationOffState(state); - UpdateConfigState(); int setGraphicParamRes = -1; int setArkuiParamRes = -1; if (state) { @@ -262,7 +255,6 @@ RetError AccessibilitySettings::SetAudioMonoState(const bool state) return RET_ERR_NULLPTR; } RetError ret = accountData->GetConfig()->SetAudioMonoState(state); - UpdateConfigState(); return ret; } @@ -370,7 +362,6 @@ RetError AccessibilitySettings::SetAudioBalance(const float balance) } RetError ret = accountData->GetConfig()->SetAudioBalance(balance); syncPromise.set_value(ret); - UpdateAudioBalance(); }), "TASK_SET_AUDIO_BALANCE"); return syncFuture.get(); } @@ -425,7 +416,6 @@ RetError AccessibilitySettings::SetIgnoreRepeatClickState(const bool state) } RetError ret = accountData->GetConfig()->SetIgnoreRepeatClickState(state); syncPromise.set_value(ret); - UpdateConfigState(); Singleton::GetInstance().UpdateInputFilter(); }), "TASK_SET_IGNORE_REPEAT_CLICK_STATE"); return syncFuture.get(); @@ -479,7 +469,6 @@ void AccessibilitySettings::UpdateSettingsInAtoHosStatePart(ConfigValueAtoHosUpd if (atoHosValue.ignoreRepeatClickState) { accountData->GetConfig()->SetIgnoreRepeatClickState(atoHosValue.ignoreRepeatClickState); } - UpdateConfigState(); } void AccessibilitySettings::UpdateSettingsInAtoHos() @@ -501,7 +490,6 @@ void AccessibilitySettings::UpdateSettingsInAtoHos() if (atoHosValue.audioBalance != 0.0) { accountData->GetConfig()->SetAudioBalance(atoHosValue.audioBalance); - UpdateAudioBalance(); } if (atoHosValue.clickResponseTime != 0) { accountData->GetConfig()->SetClickResponseTime(static_cast(atoHosValue.clickResponseTime)); @@ -854,105 +842,17 @@ RetError AccessibilitySettings::GetAudioBalance(float &balance) RetError AccessibilitySettings::GetClickResponseTime(uint32_t &time) { - HILOG_DEBUG(); - std::promise syncPromise; - std::future syncFuture = syncPromise.get_future(); - handler_->PostTask(std::bind([this, &syncPromise, &time]() -> void { - HILOG_DEBUG(); - sptr accountData = - Singleton::GetInstance().GetCurrentAccountData(); - if (!accountData) { - HILOG_ERROR("accountData is nullptr"); - syncPromise.set_value(RET_ERR_NULLPTR); - return; - } - time = accountData->GetConfig()->GetClickResponseTime(); - syncPromise.set_value(RET_OK); - }), "TASK_GET_CLICK_RESPONSE_TIME"); - - return syncFuture.get(); + return RET_OK; } RetError AccessibilitySettings::GetIgnoreRepeatClickState(bool &state) { - HILOG_DEBUG(); - std::promise syncPromise; - std::future syncFuture = syncPromise.get_future(); - handler_->PostTask(std::bind([this, &syncPromise, &state]() -> void { - HILOG_DEBUG(); - sptr accountData = - Singleton::GetInstance().GetCurrentAccountData(); - if (!accountData) { - HILOG_ERROR("accountData is nullptr"); - syncPromise.set_value(RET_ERR_NULLPTR); - return; - } - state = accountData->GetConfig()->GetIgnoreRepeatClickState(); - syncPromise.set_value(RET_OK); - }), "TASK_GET_IGNORE_REPEAT_CLICK_STATE"); - - return syncFuture.get(); + return RET_OK; } RetError AccessibilitySettings::GetIgnoreRepeatClickTime(uint32_t &time) { - HILOG_DEBUG(); - std::promise syncPromise; - std::future syncFuture = syncPromise.get_future(); - handler_->PostTask(std::bind([this, &syncPromise, &time]() -> void { - HILOG_DEBUG(); - sptr accountData = - Singleton::GetInstance().GetCurrentAccountData(); - if (!accountData) { - HILOG_ERROR("accountData is nullptr"); - syncPromise.set_value(RET_ERR_NULLPTR); - return; - } - time = accountData->GetConfig()->GetIgnoreRepeatClickTime(); - syncPromise.set_value(RET_OK); - }), "TASK_GET_IGNORE_REPEAT_CLICK_TIME"); - - return syncFuture.get(); -} - -void AccessibilitySettings::UpdateConfigState() -{ - handler_->PostTask(std::bind([this]() -> void { - HILOG_INFO("UpdateConfigState."); - sptr accountData = - Singleton::GetInstance().GetCurrentAccountData(); - if (!accountData) { - HILOG_ERROR("Account data is null"); - return; - } - - uint32_t state = accountData->GetConfig()->GetConfigState(); - for (auto &callback : accountData->GetConfigCallbacks()) { - if (callback) { - callback->OnConfigStateChanged(state); - } - } - }), "UpdateConfigState"); -} - -void AccessibilitySettings::UpdateAudioBalance() -{ - handler_->PostTask(std::bind([this]() -> void { - HILOG_INFO("UpdateAudioBalance."); - sptr accountData = - Singleton::GetInstance().GetCurrentAccountData(); - if (!accountData) { - HILOG_ERROR("Account data is null"); - return; - } - - float audioBalance = accountData->GetConfig()->GetAudioBalance(); - for (auto &callback : accountData->GetConfigCallbacks()) { - if (callback) { - callback->OnAudioBalanceChanged(audioBalance); - } - } - }), "UpdateAudioBalance"); + return RET_OK; } void AccessibilitySettings::UpdateBrightnessDiscount() @@ -1176,7 +1076,6 @@ RetError AccessibilitySettings::SetCaptionState(const bool state) return RET_ERR_NULLPTR; } RetError ret = accountData->GetConfig()->SetCaptionState(state); - UpdateConfigState(); return ret; } @@ -1233,14 +1132,12 @@ void AccessibilitySettings::UpdateAllSetting() return; } handler_->PostTask(std::bind([this]() -> void { - UpdateConfigState(); UpdateShortkeyTarget(); UpdateShortkeyMultiTarget(); UpdateMouseAutoClick(); UpdateDaltonizationColorFilter(); UpdateContentTimeout(); UpdateBrightnessDiscount(); - UpdateAudioBalance(); UpdateClickResponseTime(); UpdateIgnoreRepeatClickTime(); }), "UPDATE_ALL_SETTING"); diff --git a/services/aams/src/accessibility_settings_config.cpp b/services/aams/src/accessibility_settings_config.cpp index 26887dd0..24fd8bec 100644 --- a/services/aams/src/accessibility_settings_config.cpp +++ b/services/aams/src/accessibility_settings_config.cpp @@ -292,27 +292,6 @@ RetError AccessibilitySettingsConfig::SetIgnoreRepeatClickTime(const uint32_t ti RetError AccessibilitySettingsConfig::SetCaptionProperty(const AccessibilityConfig::CaptionProperty& caption) { - HILOG_DEBUG(); - captionProperty_ = caption; - - if (!pref_) { - HILOG_ERROR("pref_ is null!"); - return RET_ERR_NULLPTR; - } - const std::string& FONTFAMILY = captionProperty_.GetFontFamily(); - int32_t FONTSCALE = captionProperty_.GetFontScale(); - uint32_t FONTCOLOR = captionProperty_.GetFontColor(); - const std::string& FONTEDGETYPE = captionProperty_.GetFontEdgeType(); - uint32_t BACKGROUNDCOLOR = captionProperty_.GetBackgroundColor(); - uint32_t WINDOWCOLOR = captionProperty_.GetWindowColor(); - - pref_->PutString("fontFamily", FONTFAMILY); - pref_->PutInt("fontColor", static_cast(FONTCOLOR)); - pref_->PutString("fontEdgeType", FONTEDGETYPE); - pref_->PutInt("backgroundColor", static_cast(BACKGROUNDCOLOR)); - pref_->PutInt("windowColor", static_cast(WINDOWCOLOR)); - pref_->PutInt("fontScale", FONTSCALE); - pref_->Flush(); return RET_OK; } diff --git a/services/aams/src/accessible_ability_manager_service.cpp b/services/aams/src/accessible_ability_manager_service.cpp index e3c0124e..cdf54bf0 100644 --- a/services/aams/src/accessible_ability_manager_service.cpp +++ b/services/aams/src/accessible_ability_manager_service.cpp @@ -1938,12 +1938,10 @@ void AccessibleAbilityManagerService::BundleManagerDeathRecipient::OnRemoteDied( void AccessibleAbilityManagerService::UpdateConfigState() { - return accessibilitySettings_->UpdateConfigState(); } void AccessibleAbilityManagerService::UpdateAudioBalance() { - return accessibilitySettings_->UpdateAudioBalance(); } void AccessibleAbilityManagerService::UpdateBrightnessDiscount() -- Gitee