openharmony/accessibility
1
0
Fork 0
mirror of https://github.com/openharmony/accessibility.git synced 2026-08-24 22:11:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix codecheck

Browse Source 
Signed-off-by: Mupceet <laiguizhong@huawei.com>
This commit is contained in:
Mupceet
2022-10-25 14:03:31 +08:00
parent ba6c00e079
commit d252338d78
3 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
interfaces/kits/napi/accessibility_config/src/napi_accessibility_config.cpp
+1 -2
View File
@@ -515,9 +515,8 @@ napi_value NAccessibilityConfig::SetConfig(napi_env env, napi_callback_info info
HILOG_ERROR("argc is invalid: %{public}zu", argc);
errCode = OHOS::Accessibility::RET_ERR_INVALID_PARAM;
}
bool ret = false;
if (errCode == OHOS::Accessibility::RET_OK) {
bool ret = false;
switch (obj->GetConfigId()) {
case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_HIGH_CONTRAST_TEXT:
case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_INVERT_COLOR:
interfaces/kits/napi/src/napi_accessibility_system_ability_client.cpp
+4 -7
View File
@@ -413,7 +413,7 @@ napi_value NAccessibilityClient::SendEvent(napi_env env, napi_callback_info info
napi_create_async_work(env, nullptr, resource,
NAccessibilityClient::SendEventExecute,
NAccessibilityClient::SendEventComplete,
(void*)callbackInfo,
reinterpret_cast<void*>(callbackInfo),
&callbackInfo->work_);
napi_queue_async_work(env, callbackInfo->work_);
@@ -1050,13 +1050,12 @@ napi_value NAccessibilityClient::SetCaptionFrontColor(napi_env env, napi_callbac
napi_get_cb_info(env, info, &argc, parameters, nullptr, nullptr);
if (argc >= ARGS_SIZE_ONE) {
uint32_t color = GetColorValue(env, parameters[PARAM0]);
OHOS::Accessibility::RetError ret = OHOS::Accessibility::RET_OK;
auto &instance = OHOS::AccessibilityConfig::AccessibilityConfig::GetInstance();
OHOS::AccessibilityConfig::CaptionProperty captionProperty {};
instance.GetCaptionsProperty(captionProperty);
// Change the input info and then set the CaptionProperty
captionProperty.SetFontColor(color);
ret = instance.SetCaptionsProperty(captionProperty);
OHOS::Accessibility::RetError ret = instance.SetCaptionsProperty(captionProperty);
if (ret != OHOS::Accessibility::RET_OK) {
napi_value err = CreateBusinessError(env, ret);
napi_throw(env, err);
@@ -1139,13 +1138,12 @@ napi_value NAccessibilityClient::SetCaptionBackgroundColor(napi_env env, napi_ca
napi_get_cb_info(env, info, &argc, parameters, nullptr, nullptr);
if (argc >= ARGS_SIZE_ONE) {
uint32_t color = GetColorValue(env, parameters[PARAM0]);
OHOS::Accessibility::RetError ret = OHOS::Accessibility::RET_OK;
auto &instance = OHOS::AccessibilityConfig::AccessibilityConfig::GetInstance();
OHOS::AccessibilityConfig::CaptionProperty captionProperty {};
instance.GetCaptionsProperty(captionProperty);
// Change the input info and then set the CaptionProperty
captionProperty.SetBackgroundColor(color);
ret = instance.SetCaptionsProperty(captionProperty);
OHOS::Accessibility::RetError ret = instance.SetCaptionsProperty(captionProperty);
if (ret != OHOS::Accessibility::RET_OK) {
napi_value err = CreateBusinessError(env, ret);
napi_throw(env, err);
@@ -1181,13 +1179,12 @@ napi_value NAccessibilityClient::SetCaptionWindowColor(napi_env env, napi_callba
napi_get_cb_info(env, info, &argc, parameters, nullptr, nullptr);
if (argc >= ARGS_SIZE_ONE) {
uint32_t color = GetColorValue(env, parameters[PARAM0]);
OHOS::Accessibility::RetError ret = OHOS::Accessibility::RET_OK;
auto &instance = OHOS::AccessibilityConfig::AccessibilityConfig::GetInstance();
OHOS::AccessibilityConfig::CaptionProperty captionProperty {};
instance.GetCaptionsProperty(captionProperty);
// Change the input info and then set the CaptionProperty
captionProperty.SetWindowColor(color);
ret = instance.SetCaptionsProperty(captionProperty);
OHOS::Accessibility::RetError ret = instance.SetCaptionsProperty(captionProperty);
if (ret != OHOS::Accessibility::RET_OK) {
napi_value err = CreateBusinessError(env, ret);
napi_throw(env, err);
services/aams/src/accessibility_account_data.cpp
+13 -12
View File
@@ -763,18 +763,19 @@ void AccessibilityAccountData::AddAbility(const std::string &bundleName)
}
bms->QueryExtensionAbilityInfos(AppExecFwk::ExtensionAbilityType::ACCESSIBILITY, id_, extensionInfos);
HILOG_DEBUG("query extensionAbilityInfos' size is %{public}zu.", extensionInfos.size());
for (auto &newAbility : extensionInfos) {
if (newAbility.bundleName == bundleName) {
HILOG_DEBUG("The package added is an extension ability and\
extension ability's name is %{public}s", newAbility.name.c_str());
AccessibilityAbilityInitParams initParams;
Utils::Parse(newAbility, initParams);
std::shared_ptr<AccessibilityAbilityInfo> accessibilityInfo =
std::make_shared<AccessibilityAbilityInfo>(initParams);
AddInstalledAbility(*accessibilityInfo);
hasNewExtensionAbility = true;
break;
}
auto it = std::find_if(extensionInfos.begin(), extensionInfos.end(),
[&bundleName](const AppExecFwk::ExtensionAbilityInfo &newAbility) {
return newAbility.bundleName == bundleName;
});
if (it != extensionInfos.end()) {
HILOG_DEBUG("The package added is an extension ability and\
extension ability's name is %{public}s", (*it).name.c_str());
AccessibilityAbilityInitParams initParams;
Utils::Parse(*it, initParams);
std::shared_ptr<AccessibilityAbilityInfo> accessibilityInfo =
std::make_shared<AccessibilityAbilityInfo>(initParams);
AddInstalledAbility(*accessibilityInfo);
hasNewExtensionAbility = true;
}
if (hasNewExtensionAbility) {