openharmony/accessibility
1
0
Fork 0
mirror of https://gitee.com/openharmony/accessibility synced 2025-03-01 17:55:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!290 移除foundation/barrierfree/accessibility/interfaces/innerkits/acfwk/BUILD.gn中external_deps中的ability_runtime:abilitykit_native依赖，修正单词CONFIG_HIGH_CONTRASTE_TEXT拼写错误

Browse Source 
Merge pull request !290 from null/master
This commit is contained in:
openharmony_ci 2022-07-27 07:30:17 +00:00 committed by Gitee
commit e63c13fa02
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frameworks/acfwk/src/accessibility_config_impl.cpp
View File

@ -495,7 +495,7 @@ void AccessibilityConfig::Impl::UpdateHighContrastTextEnabled(const bool enabled
}
highContrastText_ = enabled;
std::map<CONFIG_ID, std::vector<std::shared_ptr<AccessibilityConfigObserver>>>::iterator it =
configObservers_.find(CONFIG_HIGH_CONTRASTE_TEXT);
configObservers_.find(CONFIG_HIGH_CONTRAST_TEXT);
if (it == configObservers_.end()) {
return;
}
@ -596,7 +596,7 @@ void AccessibilityConfig::Impl::NotifyHighContrastTextChanged(
if (observer) {
ConfigValue configValue;
configValue.highContrastText = state;
observer->OnConfigChanged(CONFIG_HIGH_CONTRASTE_TEXT, configValue);
observer->OnConfigChanged(CONFIG_HIGH_CONTRAST_TEXT, configValue);
} else {
HILOG_ERROR("end configObservers_ is null");
}

1
interfaces/innerkits/acfwk/BUILD.gn
View File

@ -53,7 +53,6 @@ ohos_shared_library("accessibilityconfig") {
external_deps = [
"ability_base:want",
"ability_runtime:abilitykit_native",
"c_utils:utils",
"hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core",

2
interfaces/innerkits/acfwk/include/accessibility_config.h
View File

@ -23,7 +23,7 @@
namespace OHOS {
namespace AccessibilityConfig {
enum CONFIG_ID : int32_t {
CONFIG_HIGH_CONTRASTE_TEXT = 0,
CONFIG_HIGH_CONTRAST_TEXT = 0,
CONFIG_INVERT_COLOR,
CONFIG_DALTONIZATION_COLOR_FILTER,
CONFIG_CONTENT_TIMEOUT,

8
interfaces/kits/napi/accessibility_config/src/napi_accessibility_config.cpp
View File

@ -277,7 +277,7 @@ void NAccessibilityConfig::SetConfigExecute(napi_env env, void* data)
}
auto &instance = Singleton<OHOS::AccessibilityConfig::AccessibilityConfig>::GetInstance();
switch (callbackInfo->id_) {
case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_HIGH_CONTRASTE_TEXT:
case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_HIGH_CONTRAST_TEXT:
instance.SetHighContrastTextState(callbackInfo->boolConfig_);
break;
case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_INVERT_COLOR:
@ -344,7 +344,7 @@ void NAccessibilityConfig::GetConfigComplete(napi_env env, napi_status status, v
napi_get_undefined(env, &undefined);
HILOG_INFO("callbackInfo->id_ = %{public}d", callbackInfo->id_);
switch (callbackInfo->id_) {
case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_HIGH_CONTRASTE_TEXT:
case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_HIGH_CONTRAST_TEXT:
case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_INVERT_COLOR:
case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_ANIMATION_OFF:
case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_SCREEN_MAGNIFICATION:
@ -399,7 +399,7 @@ void NAccessibilityConfig::GetConfigExecute(napi_env env, void* data)
}
auto &instance = Singleton<OHOS::AccessibilityConfig::AccessibilityConfig>::GetInstance();
switch (callbackInfo->id_) {
case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_HIGH_CONTRASTE_TEXT:
case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_HIGH_CONTRAST_TEXT:
instance.GetHighContrastTextState(callbackInfo->boolConfig_);
break;
case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_INVERT_COLOR:
@ -482,7 +482,7 @@ napi_value NAccessibilityConfig::SetConfig(napi_env env, napi_callback_info info
HILOG_INFO("ConfigID = %{public}d", obj->GetConfigId());
switch (obj->GetConfigId()) {
case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_HIGH_CONTRASTE_TEXT:
case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_HIGH_CONTRAST_TEXT:
case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_INVERT_COLOR:
case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_ANIMATION_OFF:
case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_SCREEN_MAGNIFICATION:

2
interfaces/kits/napi/accessibility_config/src/native_module.cpp
View File

@ -43,7 +43,7 @@ static napi_value InitHighContrastText(napi_env env)
sizeof(configDesc) / sizeof(configDesc[0]),
configDesc));
NAccessibilityConfigClass* nativeObj =
new(std::nothrow) NAccessibilityConfigClass(OHOS::AccessibilityConfig::CONFIG_HIGH_CONTRASTE_TEXT);
new(std::nothrow) NAccessibilityConfigClass(OHOS::AccessibilityConfig::CONFIG_HIGH_CONTRAST_TEXT);
if (!nativeObj) {
HILOG_ERROR("Failed to create nativeObj.");
return nullptr;

2
interfaces/kits/napi/src/napi_accessibility_config_observer.cpp
View File

@ -63,7 +63,7 @@ void NAccessibilityConfigObserver::OnConfigChanged(const ConfigValue &value)
case CONFIG_AUDIO_BALANCE:
NotifyFloatChanged2JS(value.audioBalance);
break;
case CONFIG_HIGH_CONTRASTE_TEXT:
case CONFIG_HIGH_CONTRAST_TEXT:
NotifyStateChanged2JS(value.highContrastText);
break;
case CONFIG_INVERT_COLOR: