From c9937a10dcbae9841b2627d85fc5ff53f4ea58c5 Mon Sep 17 00:00:00 2001 From: Mupceet Date: Thu, 4 Aug 2022 14:04:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=91=8A=E8=AD=A6?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mupceet --- frameworks/aafwk/test/BUILD.gn | 2 +- .../acfwk/src/accessibility_config_impl.cpp | 14 +- .../src/napi_accessibility_element.cpp | 626 ++++-------------- .../napi/include/napi_accessibility_utils.h | 1 + .../napi/src/napi_accessibility_utils.cpp | 36 +- .../aams/src/accessibility_account_data.cpp | 13 +- services/aams/test/BUILD.gn | 10 +- .../test/mock/src/mock_display_manager.cpp | 156 ----- services/test/BUILD.gn | 12 +- .../{mock_parameter.cpp => mock_parameter.c} | 0 10 files changed, 181 insertions(+), 689 deletions(-) delete mode 100644 services/aams/test/mock/src/mock_display_manager.cpp rename services/test/mock/{mock_parameter.cpp => mock_parameter.c} (100%) diff --git a/frameworks/aafwk/test/BUILD.gn b/frameworks/aafwk/test/BUILD.gn index dbd603924..d486ec0cf 100755 --- a/frameworks/aafwk/test/BUILD.gn +++ b/frameworks/aafwk/test/BUILD.gn @@ -94,7 +94,7 @@ ohos_unittest("accessible_ability_test") { "//foundation/barrierfree/accessibility/services/interface/src/parcel/accessibility_caption_parcel.cpp", "//foundation/barrierfree/accessibility/services/interface/src/parcel/accessibility_element_info_parcel.cpp", "//foundation/barrierfree/accessibility/services/interface/src/parcel/accessibility_event_info_parcel.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.cpp", + "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c", "unittest/accessibility_element_operator_callback_impl_test.cpp", "unittest/accessibility_ui_test_ability_impl_test.cpp", "unittest/accessible_ability_channel_client_test.cpp", diff --git a/frameworks/acfwk/src/accessibility_config_impl.cpp b/frameworks/acfwk/src/accessibility_config_impl.cpp index 562e014b3..619664c2b 100644 --- a/frameworks/acfwk/src/accessibility_config_impl.cpp +++ b/frameworks/acfwk/src/accessibility_config_impl.cpp @@ -23,9 +23,7 @@ namespace OHOS { namespace AccessibilityConfig { namespace { - const char *VALUE_TRUE = "true"; - const char *VALUE_FALSE = "false"; - const char *PARAMETER_NAME = "accessibility.config.ready"; + const std::string SYSTEM_PARAMETER_AAMS_NAME = "accessibility.config.ready"; constexpr int32_t CONFIG_PARAMETER_VALUE_SIZE = 10; } // namespace @@ -52,12 +50,12 @@ void AccessibilityConfig::Impl::OnParameterChanged(const char *key, const char * { HILOG_INFO("Parameter key = [%{public}s] value = [%{public}s]", key, value); - if (!key || std::strcmp(key, PARAMETER_NAME)) { + if (!key || std::strcmp(key, SYSTEM_PARAMETER_AAMS_NAME.c_str())) { HILOG_WARN("not accessibility.config.ready callback"); return; } - if (!value || std::strcmp(value, VALUE_TRUE)) { + if (!value || std::strcmp(value, "true")) { HILOG_WARN("accessibility.config.ready value not true"); return; } @@ -75,8 +73,8 @@ void AccessibilityConfig::Impl::OnParameterChanged(const char *key, const char * bool AccessibilityConfig::Impl::ConnectToService() { char value[CONFIG_PARAMETER_VALUE_SIZE] = "default"; - int retSysParam = GetParameter(PARAMETER_NAME, VALUE_FALSE, value, CONFIG_PARAMETER_VALUE_SIZE); - if (retSysParam >= 0 && !std::strcmp(value, VALUE_TRUE)) { + int retSysParam = GetParameter(SYSTEM_PARAMETER_AAMS_NAME.c_str(), "false", value, CONFIG_PARAMETER_VALUE_SIZE); + if (retSysParam >= 0 && !std::strcmp(value, "true")) { // Accessibility service is ready if (!InitAccessibilityServiceProxy()) { return false; @@ -89,7 +87,7 @@ bool AccessibilityConfig::Impl::ConnectToService() InitConfigValues(); } else { HILOG_INFO("Accessibility service is not ready, start watching"); - retSysParam = WatchParameter(PARAMETER_NAME, &OnParameterChanged, this); + retSysParam = WatchParameter(SYSTEM_PARAMETER_AAMS_NAME.c_str(), &OnParameterChanged, this); if (retSysParam) { HILOG_ERROR("Watch parameter failed, error = %{public}d", retSysParam); return false; diff --git a/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_element.cpp b/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_element.cpp index 69fe848ac..71486e4c7 100644 --- a/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_element.cpp +++ b/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_element.cpp @@ -387,16 +387,25 @@ void NAccessibilityElement::AttributeValueComplete(napi_env env, napi_status sta callbackInfo = nullptr; } -void NAccessibilityElement::GetElementInfoComponentId(NAccessibilityElementData *callbackInfo, napi_value &value) +bool CheckElementInfoParameter(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!callbackInfo) { HILOG_ERROR("callbackInfo is nullptr"); - return; + return false; } if (!callbackInfo->accessibilityElement_.elementInfo_) { HILOG_ERROR("element info is nullptr"); napi_get_undefined(callbackInfo->env_, &value); callbackInfo->ret_ = false; + return false; + } + return true; +} + +void NAccessibilityElement::GetElementInfoComponentId(NAccessibilityElementData *callbackInfo, napi_value &value) +{ + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -405,14 +414,8 @@ void NAccessibilityElement::GetElementInfoComponentId(NAccessibilityElementData void NAccessibilityElement::GetElementInfoPageId(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -421,14 +424,8 @@ void NAccessibilityElement::GetElementInfoPageId(NAccessibilityElementData *call void NAccessibilityElement::GetElementInfoParentId(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -437,14 +434,8 @@ void NAccessibilityElement::GetElementInfoParentId(NAccessibilityElementData *ca void NAccessibilityElement::GetElementInfoInspectorKey(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_, @@ -453,14 +444,8 @@ void NAccessibilityElement::GetElementInfoInspectorKey(NAccessibilityElementData void NAccessibilityElement::GetElementInfoBundleName(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_, @@ -469,14 +454,8 @@ void NAccessibilityElement::GetElementInfoBundleName(NAccessibilityElementData * void NAccessibilityElement::GetElementInfoComponentType(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_, @@ -485,14 +464,8 @@ void NAccessibilityElement::GetElementInfoComponentType(NAccessibilityElementDat void NAccessibilityElement::GetElementInfoInputType(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -501,14 +474,8 @@ void NAccessibilityElement::GetElementInfoInputType(NAccessibilityElementData *c void NAccessibilityElement::GetElementInfoText(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_, @@ -517,14 +484,8 @@ void NAccessibilityElement::GetElementInfoText(NAccessibilityElementData *callba void NAccessibilityElement::GetElementInfoHintText(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_, @@ -533,14 +494,8 @@ void NAccessibilityElement::GetElementInfoHintText(NAccessibilityElementData *ca void NAccessibilityElement::GetElementInfoDescription(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_, @@ -549,14 +504,8 @@ void NAccessibilityElement::GetElementInfoDescription(NAccessibilityElementData void NAccessibilityElement::GetElementInfoResourceName(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_, @@ -565,14 +514,8 @@ void NAccessibilityElement::GetElementInfoResourceName(NAccessibilityElementData void NAccessibilityElement::GetElementInfoChildNodeIds(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } std::vector childIds = callbackInfo->accessibilityElement_.elementInfo_->GetChildIds(); @@ -589,14 +532,8 @@ void NAccessibilityElement::GetElementInfoChildNodeIds(NAccessibilityElementData void NAccessibilityElement::GetElementInfoTextLengthLimit(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -605,14 +542,8 @@ void NAccessibilityElement::GetElementInfoTextLengthLimit(NAccessibilityElementD void NAccessibilityElement::GetElementInfoRect(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } OHOS::Accessibility::Rect screenRect = callbackInfo->accessibilityElement_.elementInfo_->GetRectInScreen(); @@ -622,14 +553,8 @@ void NAccessibilityElement::GetElementInfoRect(NAccessibilityElementData *callba void NAccessibilityElement::GetElementInfoCheckable(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -638,14 +563,8 @@ void NAccessibilityElement::GetElementInfoCheckable(NAccessibilityElementData *c void NAccessibilityElement::GetElementInfoChecked(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -654,14 +573,8 @@ void NAccessibilityElement::GetElementInfoChecked(NAccessibilityElementData *cal void NAccessibilityElement::GetElementInfoFocusable(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -670,14 +583,8 @@ void NAccessibilityElement::GetElementInfoFocusable(NAccessibilityElementData *c void NAccessibilityElement::GetElementInfoIsVisible(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -687,14 +594,8 @@ void NAccessibilityElement::GetElementInfoIsVisible(NAccessibilityElementData *c void NAccessibilityElement::GetElementInfoAccessibilityFocused( NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -703,14 +604,8 @@ void NAccessibilityElement::GetElementInfoAccessibilityFocused( void NAccessibilityElement::GetElementInfoSelected(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -719,14 +614,8 @@ void NAccessibilityElement::GetElementInfoSelected(NAccessibilityElementData *ca void NAccessibilityElement::GetElementInfoClickable(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -735,14 +624,8 @@ void NAccessibilityElement::GetElementInfoClickable(NAccessibilityElementData *c void NAccessibilityElement::GetElementInfoLongClickable(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -751,14 +634,8 @@ void NAccessibilityElement::GetElementInfoLongClickable(NAccessibilityElementDat void NAccessibilityElement::GetElementInfoIsEnable(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -767,14 +644,8 @@ void NAccessibilityElement::GetElementInfoIsEnable(NAccessibilityElementData *ca void NAccessibilityElement::GetElementInfoIsPassword(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -783,14 +654,8 @@ void NAccessibilityElement::GetElementInfoIsPassword(NAccessibilityElementData * void NAccessibilityElement::GetElementInfoScrollable(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -799,14 +664,8 @@ void NAccessibilityElement::GetElementInfoScrollable(NAccessibilityElementData * void NAccessibilityElement::GetElementInfoEditable(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -815,14 +674,8 @@ void NAccessibilityElement::GetElementInfoEditable(NAccessibilityElementData *ca void NAccessibilityElement::GetElementInfoPopupSupported(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -832,14 +685,8 @@ void NAccessibilityElement::GetElementInfoPopupSupported(NAccessibilityElementDa void NAccessibilityElement::GetElementInfoPluralLineSupported( NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -848,14 +695,8 @@ void NAccessibilityElement::GetElementInfoPluralLineSupported( void NAccessibilityElement::GetElementInfoDeleteable(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -864,14 +705,8 @@ void NAccessibilityElement::GetElementInfoDeleteable(NAccessibilityElementData * void NAccessibilityElement::GetElementInfoIsHint(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -880,14 +715,8 @@ void NAccessibilityElement::GetElementInfoIsHint(NAccessibilityElementData *call void NAccessibilityElement::GetElementInfoIsEssential(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -896,14 +725,8 @@ void NAccessibilityElement::GetElementInfoIsEssential(NAccessibilityElementData void NAccessibilityElement::GetElementInfoItemCount(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -912,14 +735,8 @@ void NAccessibilityElement::GetElementInfoItemCount(NAccessibilityElementData *c void NAccessibilityElement::GetElementInfoCurrentIndex(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -928,14 +745,8 @@ void NAccessibilityElement::GetElementInfoCurrentIndex(NAccessibilityElementData void NAccessibilityElement::GetElementInfoStartIndex(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -944,14 +755,8 @@ void NAccessibilityElement::GetElementInfoStartIndex(NAccessibilityElementData * void NAccessibilityElement::GetElementInfoEndIndex(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -960,14 +765,8 @@ void NAccessibilityElement::GetElementInfoEndIndex(NAccessibilityElementData *ca void NAccessibilityElement::GetElementInfoValueMax(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -976,14 +775,8 @@ void NAccessibilityElement::GetElementInfoValueMax(NAccessibilityElementData *ca void NAccessibilityElement::GetElementInfoValueMin(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -992,14 +785,8 @@ void NAccessibilityElement::GetElementInfoValueMin(NAccessibilityElementData *ca void NAccessibilityElement::GetElementInfoValueNow(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -1008,14 +795,8 @@ void NAccessibilityElement::GetElementInfoValueNow(NAccessibilityElementData *ca void NAccessibilityElement::GetElementInfoGrid(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } OHOS::Accessibility::GridInfo gridInfo = callbackInfo->accessibilityElement_.elementInfo_->GetGrid(); @@ -1025,14 +806,8 @@ void NAccessibilityElement::GetElementInfoGrid(NAccessibilityElementData *callba void NAccessibilityElement::GetElementInfoGridItem(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } OHOS::Accessibility::GridItemInfo gridItemInfo = @@ -1043,14 +818,8 @@ void NAccessibilityElement::GetElementInfoGridItem(NAccessibilityElementData *ca void NAccessibilityElement::GetElementInfoActiveRegion(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -1059,14 +828,8 @@ void NAccessibilityElement::GetElementInfoActiveRegion(NAccessibilityElementData void NAccessibilityElement::GetElementInfoIsContentInvalid(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -1075,14 +838,8 @@ void NAccessibilityElement::GetElementInfoIsContentInvalid(NAccessibilityElement void NAccessibilityElement::GetElementInfoError(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_, @@ -1091,14 +848,8 @@ void NAccessibilityElement::GetElementInfoError(NAccessibilityElementData *callb void NAccessibilityElement::GetElementInfoLabel(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -1107,14 +858,8 @@ void NAccessibilityElement::GetElementInfoLabel(NAccessibilityElementData *callb void NAccessibilityElement::GetElementInfoBeginSelected(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -1123,14 +868,8 @@ void NAccessibilityElement::GetElementInfoBeginSelected(NAccessibilityElementDat void NAccessibilityElement::GetElementInfoEndSelected(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -1139,14 +878,8 @@ void NAccessibilityElement::GetElementInfoEndSelected(NAccessibilityElementData void NAccessibilityElement::GetElementInfoTextMoveUnit(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } std::string textMoveUnit = ConvertTextMoveUnitToString( @@ -1164,14 +897,8 @@ void NAccessibilityElement::GetElementInfoTextMoveUnit(NAccessibilityElementData void NAccessibilityElement::GetElementInfoParent(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } if (callbackInfo->ret_) { @@ -1189,14 +916,8 @@ void NAccessibilityElement::GetElementInfoParent(NAccessibilityElementData *call void NAccessibilityElement::GetElementInfoChildren(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } if (callbackInfo->ret_) { @@ -1210,14 +931,8 @@ void NAccessibilityElement::GetElementInfoChildren(NAccessibilityElementData *ca void NAccessibilityElement::GetElementInfoTriggerAction(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } std::string triggerAction = ConvertOperationTypeToString( @@ -1235,14 +950,8 @@ void NAccessibilityElement::GetElementInfoTriggerAction(NAccessibilityElementDat void NAccessibilityElement::GetElementInfoContents(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } std::vector contents {}; @@ -1262,14 +971,8 @@ void NAccessibilityElement::GetElementInfoContents(NAccessibilityElementData *ca void NAccessibilityElement::GetElementInfoLastContent(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_, @@ -1278,14 +981,8 @@ void NAccessibilityElement::GetElementInfoLastContent(NAccessibilityElementData void NAccessibilityElement::GetElementInfoWindowId(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -1294,30 +991,33 @@ void NAccessibilityElement::GetElementInfoWindowId(NAccessibilityElementData *ca void NAccessibilityElement::GetElementInfoIsFocused(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.elementInfo_) { - HILOG_ERROR("element info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckElementInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, callbackInfo->accessibilityElement_.elementInfo_->IsFocused(), &value)); } -void NAccessibilityElement::GetWindowInfoIsActive(NAccessibilityElementData *callbackInfo, napi_value &value) +bool CheckWindowInfoParameter(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!callbackInfo) { HILOG_ERROR("callbackInfo is nullptr"); - return; + return false; } if (!callbackInfo->accessibilityElement_.windowInfo_) { HILOG_ERROR("window info is nullptr"); napi_get_undefined(callbackInfo->env_, &value); callbackInfo->ret_ = false; + return false; + } + return true; +} + +void NAccessibilityElement::GetWindowInfoIsActive(NAccessibilityElementData *callbackInfo, napi_value &value) +{ + if (!CheckWindowInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -1326,14 +1026,8 @@ void NAccessibilityElement::GetWindowInfoIsActive(NAccessibilityElementData *cal void NAccessibilityElement::GetWindowInfoScreenRect(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.windowInfo_) { - HILOG_ERROR("window info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckWindowInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } OHOS::Accessibility::Rect screenRect = callbackInfo->accessibilityElement_.windowInfo_->GetRectInScreen(); @@ -1343,14 +1037,8 @@ void NAccessibilityElement::GetWindowInfoScreenRect(NAccessibilityElementData *c void NAccessibilityElement::GetWindowInfoLayer(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.windowInfo_) { - HILOG_ERROR("window info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckWindowInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -1359,14 +1047,8 @@ void NAccessibilityElement::GetWindowInfoLayer(NAccessibilityElementData *callba void NAccessibilityElement::GetWindowInfoType(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.windowInfo_) { - HILOG_ERROR("window info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckWindowInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } std::string accessibilityWindowType = ConvertWindowTypeToString( @@ -1384,14 +1066,8 @@ void NAccessibilityElement::GetWindowInfoType(NAccessibilityElementData *callbac void NAccessibilityElement::GetWindowInfoAnchor(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.windowInfo_) { - HILOG_ERROR("window info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckWindowInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } if (callbackInfo->ret_) { @@ -1409,14 +1085,8 @@ void NAccessibilityElement::GetWindowInfoAnchor(NAccessibilityElementData *callb void NAccessibilityElement::GetWindowInfoRootElement(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.windowInfo_) { - HILOG_ERROR("window info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckWindowInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } if (callbackInfo->ret_) { @@ -1434,14 +1104,8 @@ void NAccessibilityElement::GetWindowInfoRootElement(NAccessibilityElementData * void NAccessibilityElement::GetWindowInfoIsFocused(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.windowInfo_) { - HILOG_ERROR("window info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckWindowInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -1450,14 +1114,8 @@ void NAccessibilityElement::GetWindowInfoIsFocused(NAccessibilityElementData *ca void NAccessibilityElement::GetWindowInfoWindowId(NAccessibilityElementData *callbackInfo, napi_value &value) { - if (!callbackInfo) { - HILOG_ERROR("callbackInfo is nullptr"); - return; - } - if (!callbackInfo->accessibilityElement_.windowInfo_) { - HILOG_ERROR("window info is nullptr"); - napi_get_undefined(callbackInfo->env_, &value); - callbackInfo->ret_ = false; + if (!CheckWindowInfoParameter(callbackInfo, value)) { + HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, diff --git a/interfaces/kits/napi/include/napi_accessibility_utils.h b/interfaces/kits/napi/include/napi_accessibility_utils.h index 95c7052a1..1a3727bc3 100644 --- a/interfaces/kits/napi/include/napi_accessibility_utils.h +++ b/interfaces/kits/napi/include/napi_accessibility_utils.h @@ -48,6 +48,7 @@ constexpr int32_t CHAE_BUFFER_MAX = 1024; std::string GetStringFromNAPI(napi_env env, napi_value value); bool ParseBool(napi_env env, bool& param, napi_value args); bool ParseString(napi_env env, std::string& param, napi_value args); +bool ParseNumber(napi_env env, napi_value args); bool ParseUint32(napi_env env, uint32_t& param, napi_value args); bool ParseInt32(napi_env env, int32_t& param, napi_value args); bool ParseDouble(napi_env env, double& param, napi_value args); diff --git a/interfaces/kits/napi/src/napi_accessibility_utils.cpp b/interfaces/kits/napi/src/napi_accessibility_utils.cpp index cc97313c0..983864971 100644 --- a/interfaces/kits/napi/src/napi_accessibility_utils.cpp +++ b/interfaces/kits/napi/src/napi_accessibility_utils.cpp @@ -88,7 +88,7 @@ bool ParseString(napi_env env, std::string& param, napi_value args) return true; } -bool ParseUint32(napi_env env, uint32_t& param, napi_value args) +bool ParseNumber(napi_env env, napi_value args) { napi_status status; napi_valuetype valuetype; @@ -102,44 +102,34 @@ bool ParseUint32(napi_env env, uint32_t& param, napi_value args) HILOG_ERROR("Wrong argument type. uint32 expected."); return false; } + + HILOG_DEBUG("The type of args is number."); + return true; +} + +bool ParseUint32(napi_env env, uint32_t& param, napi_value args) +{ + if (!ParseNumber(env, args)) { + return false; + } napi_get_value_uint32(env, args, ¶m); - HILOG_DEBUG("param=%{public}u.", valuetype); return true; } bool ParseInt32(napi_env env, int32_t& param, napi_value args) { - napi_status status; - napi_valuetype valuetype; - status = napi_typeof(env, args, &valuetype); - if (status != napi_ok) { - HILOG_ERROR("napi_typeof error and status is %{public}d", status); - return false; - } - - if (valuetype != napi_number) { - HILOG_ERROR("Wrong argument type. uint32 expected."); + if (!ParseNumber(env, args)) { return false; } napi_get_value_int32(env, args, ¶m); - HILOG_DEBUG("param=%{public}d.", valuetype); return true; } bool ParseDouble(napi_env env, double& param, napi_value args) { - napi_status status; - napi_valuetype valuetype; - status = napi_typeof(env, args, &valuetype); - if (status != napi_ok) { - HILOG_ERROR("napi_typeof error and status is %{public}d", status); - return false; - } - - if (valuetype != napi_number) { - HILOG_ERROR("Wrong argument type. uint32 expected."); + if (!ParseNumber(env, args)) { return false; } diff --git a/services/aams/src/accessibility_account_data.cpp b/services/aams/src/accessibility_account_data.cpp index a637f4f96..15c136e46 100644 --- a/services/aams/src/accessibility_account_data.cpp +++ b/services/aams/src/accessibility_account_data.cpp @@ -789,12 +789,13 @@ void AccessibilityAccountData::UpdateAbilities() iter = std::find(enabledAbilities_.begin(), enabledAbilities_.end(), Utils::GetUri(bundleName, abilityName)); if (iter != enabledAbilities_.end()) { - if (!connection) { - AppExecFwk::ElementName element(deviceId, bundleName, abilityName); - connection = new(std::nothrow) AccessibleAbilityConnection(this, connectCounter_++, installAbility); - if (connection) { - connection->Connect(element); - } + if (connection) { + continue; + } + AppExecFwk::ElementName element(deviceId, bundleName, abilityName); + connection = new(std::nothrow) AccessibleAbilityConnection(this, connectCounter_++, installAbility); + if (connection) { + connection->Connect(element); } } else { HILOG_DEBUG("not in enabledAbilites list ."); diff --git a/services/aams/test/BUILD.gn b/services/aams/test/BUILD.gn index 0f9798b15..ae3a8ad13 100644 --- a/services/aams/test/BUILD.gn +++ b/services/aams/test/BUILD.gn @@ -184,6 +184,7 @@ ohos_unittest("accessibility_touch_guider_test") { "../src/utils.cpp", "//foundation/barrierfree/accessibility/services/interface/src/accessibility_element_operator_callback_stub.cpp", "//foundation/barrierfree/accessibility/services/interface/src/parcel/accessibility_element_info_parcel.cpp", + "//foundation/barrierfree/accessibility/services/test/mock/mock_display_manager.cpp", "mock/src/mock_accessibility_account_data.cpp", "mock/src/mock_accessibility_common_event.cpp", "mock/src/mock_accessibility_event_transmission.cpp", @@ -200,7 +201,6 @@ ohos_unittest("accessibility_touch_guider_test") { "mock/src/mock_common_event_subscriber.cpp", "mock/src/mock_common_event_support.cpp", "mock/src/mock_display.cpp", - "mock/src/mock_display_manager.cpp", "mock/src/mock_matching_skill.cpp", "mock/src/mock_system_ability.cpp", "unittest/accessibility_touch_guider_test.cpp", @@ -249,7 +249,7 @@ ohos_unittest("accessibility_common_event_registry_test") { "//foundation/barrierfree/accessibility/services/interface/src/accessible_ability_channel_proxy.cpp", "//foundation/barrierfree/accessibility/services/interface/src/accessible_ability_client_proxy.cpp", "//foundation/barrierfree/accessibility/services/interface/src/accessible_ability_manager_service_stub.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.cpp", + "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c", "mock/src/mock_accessibility_account_data.cpp", "mock/src/mock_common_event_data.cpp", "mock/src/mock_common_event_manager.cpp", @@ -317,7 +317,7 @@ ohos_unittest("accessibility_input_interceptor_test") { "//foundation/barrierfree/accessibility/frameworks/common/src/accessibility_window_info.cpp", "//foundation/barrierfree/accessibility/services/interface/src/accessible_ability_channel_proxy.cpp", "//foundation/barrierfree/accessibility/services/interface/src/accessible_ability_client_proxy.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.cpp", + "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c", "mock/src/aafwk/mock_bundle_manager.cpp", "mock/src/mock_accessibility_account_data.cpp", "mock/src/mock_accessibility_gesture_recognizer.cpp", @@ -439,7 +439,7 @@ ohos_unittest("accessibility_keyevent_filter_test") { "//foundation/barrierfree/accessibility/services/interface/src/accessible_ability_client_proxy.cpp", "//foundation/barrierfree/accessibility/services/interface/src/accessible_ability_client_stub.cpp", "//foundation/barrierfree/accessibility/services/interface/src/accessible_ability_manager_service_stub.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.cpp", + "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c", "mock/src/aafwk/mock_bundle_manager.cpp", "mock/src/mock_common_event_data.cpp", "mock/src/mock_common_event_manager.cpp", @@ -510,7 +510,7 @@ ohos_unittest("accessible_ability_connection_test") { "../src/accessible_ability_manager_service.cpp", "../src/accessible_ability_manager_service_event_handler.cpp", "../src/utils.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.cpp", + "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c", "mock/src/aafwk/mock_ability_manager_client.cpp", "mock/src/aafwk/mock_bundle_manager.cpp", "mock/src/mock_accessibility_element_operator_callback_stub.cpp", diff --git a/services/aams/test/mock/src/mock_display_manager.cpp b/services/aams/test/mock/src/mock_display_manager.cpp deleted file mode 100644 index 9d23908db..000000000 --- a/services/aams/test/mock/src/mock_display_manager.cpp +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Copyright (C) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include "display_manager.h" -#include "display.h" -#include "dm_common.h" -#include "singleton_delegator.h" -#include "window/window_manager/utils/include/display_info.h" - -namespace OHOS::Rosen { -WM_IMPLEMENT_SINGLE_INSTANCE(DisplayManager) -class DisplayManager::Impl : public RefBase { - friend class DisplayManager; - -private: - bool CheckRectValid(const Media::Rect& rect, int32_t oriHeight, int32_t oriWidth) const; - bool CheckSizeValid(const Media::Size& size, int32_t oriHeight, int32_t oriWidth) const; - void ClearDisplayStateCallback(); -}; - -bool DisplayManager::Impl::CheckRectValid(const Media::Rect& rect, int32_t oriHeight, int32_t oriWidth) const -{ - return true; -} - -bool DisplayManager::Impl::CheckSizeValid(const Media::Size& size, int32_t oriHeight, int32_t oriWidth) const -{ - return true; -} - -void DisplayManager::Impl::ClearDisplayStateCallback() -{} - -DisplayManager::DisplayManager() -{} - -DisplayManager::~DisplayManager() -{} - -DisplayId DisplayManager::GetDefaultDisplayId() -{ - DisplayId id {0}; - return id; -} - -sptr DisplayManager::GetDisplayById(DisplayId displayId) -{ - sptr display = new Display("display_mock", nullptr); - return display; -} - -std::shared_ptr DisplayManager::GetScreenshot(DisplayId displayId) -{ - return nullptr; -} - -std::shared_ptr DisplayManager::GetScreenshot( - DisplayId displayId, const Media::Rect& rect, const Media::Size& size, int rotation) -{ - return nullptr; -} - -sptr DisplayManager::GetDefaultDisplay() -{ - return GetDisplayById(GetDefaultDisplayId()); -} - -std::vector DisplayManager::GetAllDisplayIds() -{ - std::vector res = {}; - return res; -} - -std::vector> DisplayManager::GetAllDisplays() -{ - std::vector> res; - return res; -} - -bool DisplayManager::RegisterDisplayListener(sptr listener) -{ - return true; -} - -bool DisplayManager::UnregisterDisplayListener(sptr listener) -{ - return true; -} - -bool DisplayManager::RegisterDisplayPowerEventListener(sptr listener) -{ - return true; -} - -bool DisplayManager::UnregisterDisplayPowerEventListener(sptr listener) -{ - return true; -} - -bool DisplayManager::WakeUpBegin(PowerStateChangeReason reason) -{ - return true; -} - -bool DisplayManager::WakeUpEnd() -{ - return true; -} - -bool DisplayManager::SuspendBegin(PowerStateChangeReason reason) -{ - return true; -} - -bool DisplayManager::SuspendEnd() -{ - return true; -} - -bool DisplayManager::SetDisplayState(DisplayState state, DisplayStateCallback callback) -{ - return true; -} - -DisplayState DisplayManager::GetDisplayState(DisplayId displayId) -{ - DisplayState state = DisplayState::UNKNOWN; - return state; -} - -bool DisplayManager::SetScreenBrightness(uint64_t screenId, uint32_t level) -{ - return true; -} - -uint32_t DisplayManager::GetScreenBrightness(uint64_t screenId) const -{ - return 0; -} - -void DisplayManager::NotifyDisplayEvent(DisplayEvent event) -{} -} // namespace OHOS::Rosen \ No newline at end of file diff --git a/services/test/BUILD.gn b/services/test/BUILD.gn index f155ca3de..d35913e3e 100644 --- a/services/test/BUILD.gn +++ b/services/test/BUILD.gn @@ -115,7 +115,7 @@ ohos_moduletest("aams_accessibility_touch_guider_test") { "//foundation/barrierfree/accessibility/services/test/mock/mock_display.cpp", "//foundation/barrierfree/accessibility/services/test/mock/mock_display_manager.cpp", "//foundation/barrierfree/accessibility/services/test/mock/mock_os_account_manager.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.cpp", + "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c", "//foundation/barrierfree/accessibility/services/test/mock/mock_service_registry.cpp", "//foundation/barrierfree/accessibility/services/test/mock/mock_system_ability.cpp", "moduletest/aamstest/aams_accessibility_touch_guider_test/aams_accessibility_touch_guider_test.cpp", @@ -195,7 +195,7 @@ ohos_moduletest("aams_accessibility_touchEvent_injector_test") { "//foundation/barrierfree/accessibility/services/test/mock/mock_display.cpp", "//foundation/barrierfree/accessibility/services/test/mock/mock_display_manager.cpp", "//foundation/barrierfree/accessibility/services/test/mock/mock_os_account_manager.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.cpp", + "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c", "//foundation/barrierfree/accessibility/services/test/mock/mock_service_registry.cpp", "//foundation/barrierfree/accessibility/services/test/mock/mock_system_ability.cpp", "moduletest/aamstest/aams_accessibility_touchEvent_injector_test/aams_accessibility_touchEvent_injector_test.cpp", @@ -282,7 +282,7 @@ ohos_moduletest("aams_accessible_ability_channel_test") { "//foundation/barrierfree/accessibility/services/test/mock/mock_display_manager.cpp", "//foundation/barrierfree/accessibility/services/test/mock/mock_matching_skill.cpp", "//foundation/barrierfree/accessibility/services/test/mock/mock_os_account_manager.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.cpp", + "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c", "//foundation/barrierfree/accessibility/services/test/mock/mock_service_registry.cpp", "//foundation/barrierfree/accessibility/services/test/mock/mock_system_ability.cpp", "moduletest/aamstest/aams_accessible_ability_channel_test/aams_accessible_ability_channel_test.cpp", @@ -367,7 +367,7 @@ ohos_moduletest("aams_server_test") { "//foundation/barrierfree/accessibility/services/test/mock/mock_display_manager.cpp", "//foundation/barrierfree/accessibility/services/test/mock/mock_matching_skill.cpp", "//foundation/barrierfree/accessibility/services/test/mock/mock_os_account_manager.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.cpp", + "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c", "//foundation/barrierfree/accessibility/services/test/mock/mock_service_registry.cpp", "//foundation/barrierfree/accessibility/services/test/mock/mock_system_ability.cpp", "moduletest/aamstest/aams_server_test/aams_server_test.cpp", @@ -446,7 +446,7 @@ ohos_moduletest("aams_accessibility_keyevent_filter_test") { "//foundation/barrierfree/accessibility/services/test/mock/mock_display.cpp", "//foundation/barrierfree/accessibility/services/test/mock/mock_display_manager.cpp", "//foundation/barrierfree/accessibility/services/test/mock/mock_os_account_manager.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.cpp", + "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c", "//foundation/barrierfree/accessibility/services/test/mock/mock_service_registry.cpp", "//foundation/barrierfree/accessibility/services/test/mock/mock_system_ability.cpp", "moduletest/aamstest/aams_accessibility_keyevent_filter_test/aams_accessibility_keyevent_filter_test.cpp", @@ -531,7 +531,7 @@ ohos_moduletest("aams_common_event_registry_test") { "//foundation/barrierfree/accessibility/services/test/mock/mock_display_manager.cpp", "//foundation/barrierfree/accessibility/services/test/mock/mock_matching_skill.cpp", "//foundation/barrierfree/accessibility/services/test/mock/mock_os_account_manager.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.cpp", + "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c", "//foundation/barrierfree/accessibility/services/test/mock/mock_service_registry.cpp", "//foundation/barrierfree/accessibility/services/test/mock/mock_system_ability.cpp", "moduletest/aamstest/aams_common_event_registry_test/aams_common_event_registry_test.cpp", diff --git a/services/test/mock/mock_parameter.cpp b/services/test/mock/mock_parameter.c similarity index 100% rename from services/test/mock/mock_parameter.cpp rename to services/test/mock/mock_parameter.c From e9ef11762ae026e8d6287685d25117068fe43431 Mon Sep 17 00:00:00 2001 From: Mupceet Date: Thu, 4 Aug 2022 15:29:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?codecheck=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mupceet --- .../include/napi_accessibility_element.h | 3 +++ .../src/napi_accessibility_element.cpp | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/interfaces/kits/napi/accessibility_extension_module_loader/include/napi_accessibility_element.h b/interfaces/kits/napi/accessibility_extension_module_loader/include/napi_accessibility_element.h index c6da146da..4b54ca447 100644 --- a/interfaces/kits/napi/accessibility_extension_module_loader/include/napi_accessibility_element.h +++ b/interfaces/kits/napi/accessibility_extension_module_loader/include/napi_accessibility_element.h @@ -157,6 +157,9 @@ private: static OHOS::Accessibility::FocusMoveDirection ConvertStringToDirection(const std::string &str); static int32_t ConvertStringToFocusType(const std::string &str); + static bool CheckElementInfoParameter(NAccessibilityElementData *callbackInfo, napi_value &value); + static bool CheckWindowInfoParameter(NAccessibilityElementData *callbackInfo, napi_value &value); + NAccessibilityElement() = default; ~NAccessibilityElement() = default; }; diff --git a/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_element.cpp b/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_element.cpp index 71486e4c7..f488ffcd8 100644 --- a/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_element.cpp +++ b/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_element.cpp @@ -387,7 +387,7 @@ void NAccessibilityElement::AttributeValueComplete(napi_env env, napi_status sta callbackInfo = nullptr; } -bool CheckElementInfoParameter(NAccessibilityElementData *callbackInfo, napi_value &value) +bool NAccessibilityElement::CheckElementInfoParameter(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!callbackInfo) { HILOG_ERROR("callbackInfo is nullptr"); @@ -999,7 +999,7 @@ void NAccessibilityElement::GetElementInfoIsFocused(NAccessibilityElementData *c callbackInfo->accessibilityElement_.elementInfo_->IsFocused(), &value)); } -bool CheckWindowInfoParameter(NAccessibilityElementData *callbackInfo, napi_value &value) +bool NAccessibilityElement::CheckWindowInfoParameter(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!callbackInfo) { HILOG_ERROR("callbackInfo is nullptr"); From 473740f8ba1072a96e3e9f5d6ddd5fc1333ae6b0 Mon Sep 17 00:00:00 2001 From: Mupceet Date: Tue, 9 Aug 2022 10:12:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=84=E5=AE=A1?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mupceet --- .../src/napi_accessibility_element.cpp | 62 ------------------- 1 file changed, 62 deletions(-) diff --git a/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_element.cpp b/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_element.cpp index f488ffcd8..6a6680a1b 100644 --- a/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_element.cpp +++ b/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_element.cpp @@ -405,7 +405,6 @@ bool NAccessibilityElement::CheckElementInfoParameter(NAccessibilityElementData void NAccessibilityElement::GetElementInfoComponentId(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -415,7 +414,6 @@ void NAccessibilityElement::GetElementInfoComponentId(NAccessibilityElementData void NAccessibilityElement::GetElementInfoPageId(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -425,7 +423,6 @@ void NAccessibilityElement::GetElementInfoPageId(NAccessibilityElementData *call void NAccessibilityElement::GetElementInfoParentId(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -435,7 +432,6 @@ void NAccessibilityElement::GetElementInfoParentId(NAccessibilityElementData *ca void NAccessibilityElement::GetElementInfoInspectorKey(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_, @@ -445,7 +441,6 @@ void NAccessibilityElement::GetElementInfoInspectorKey(NAccessibilityElementData void NAccessibilityElement::GetElementInfoBundleName(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_, @@ -455,7 +450,6 @@ void NAccessibilityElement::GetElementInfoBundleName(NAccessibilityElementData * void NAccessibilityElement::GetElementInfoComponentType(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_, @@ -465,7 +459,6 @@ void NAccessibilityElement::GetElementInfoComponentType(NAccessibilityElementDat void NAccessibilityElement::GetElementInfoInputType(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -475,7 +468,6 @@ void NAccessibilityElement::GetElementInfoInputType(NAccessibilityElementData *c void NAccessibilityElement::GetElementInfoText(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_, @@ -485,7 +477,6 @@ void NAccessibilityElement::GetElementInfoText(NAccessibilityElementData *callba void NAccessibilityElement::GetElementInfoHintText(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_, @@ -495,7 +486,6 @@ void NAccessibilityElement::GetElementInfoHintText(NAccessibilityElementData *ca void NAccessibilityElement::GetElementInfoDescription(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_, @@ -505,7 +495,6 @@ void NAccessibilityElement::GetElementInfoDescription(NAccessibilityElementData void NAccessibilityElement::GetElementInfoResourceName(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_, @@ -515,7 +504,6 @@ void NAccessibilityElement::GetElementInfoResourceName(NAccessibilityElementData void NAccessibilityElement::GetElementInfoChildNodeIds(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } std::vector childIds = callbackInfo->accessibilityElement_.elementInfo_->GetChildIds(); @@ -533,7 +521,6 @@ void NAccessibilityElement::GetElementInfoChildNodeIds(NAccessibilityElementData void NAccessibilityElement::GetElementInfoTextLengthLimit(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -543,7 +530,6 @@ void NAccessibilityElement::GetElementInfoTextLengthLimit(NAccessibilityElementD void NAccessibilityElement::GetElementInfoRect(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } OHOS::Accessibility::Rect screenRect = callbackInfo->accessibilityElement_.elementInfo_->GetRectInScreen(); @@ -554,7 +540,6 @@ void NAccessibilityElement::GetElementInfoRect(NAccessibilityElementData *callba void NAccessibilityElement::GetElementInfoCheckable(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -564,7 +549,6 @@ void NAccessibilityElement::GetElementInfoCheckable(NAccessibilityElementData *c void NAccessibilityElement::GetElementInfoChecked(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -574,7 +558,6 @@ void NAccessibilityElement::GetElementInfoChecked(NAccessibilityElementData *cal void NAccessibilityElement::GetElementInfoFocusable(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -584,7 +567,6 @@ void NAccessibilityElement::GetElementInfoFocusable(NAccessibilityElementData *c void NAccessibilityElement::GetElementInfoIsVisible(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -595,7 +577,6 @@ void NAccessibilityElement::GetElementInfoAccessibilityFocused( NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -605,7 +586,6 @@ void NAccessibilityElement::GetElementInfoAccessibilityFocused( void NAccessibilityElement::GetElementInfoSelected(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -615,7 +595,6 @@ void NAccessibilityElement::GetElementInfoSelected(NAccessibilityElementData *ca void NAccessibilityElement::GetElementInfoClickable(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -625,7 +604,6 @@ void NAccessibilityElement::GetElementInfoClickable(NAccessibilityElementData *c void NAccessibilityElement::GetElementInfoLongClickable(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -635,7 +613,6 @@ void NAccessibilityElement::GetElementInfoLongClickable(NAccessibilityElementDat void NAccessibilityElement::GetElementInfoIsEnable(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -645,7 +622,6 @@ void NAccessibilityElement::GetElementInfoIsEnable(NAccessibilityElementData *ca void NAccessibilityElement::GetElementInfoIsPassword(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -655,7 +631,6 @@ void NAccessibilityElement::GetElementInfoIsPassword(NAccessibilityElementData * void NAccessibilityElement::GetElementInfoScrollable(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -665,7 +640,6 @@ void NAccessibilityElement::GetElementInfoScrollable(NAccessibilityElementData * void NAccessibilityElement::GetElementInfoEditable(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -675,7 +649,6 @@ void NAccessibilityElement::GetElementInfoEditable(NAccessibilityElementData *ca void NAccessibilityElement::GetElementInfoPopupSupported(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -686,7 +659,6 @@ void NAccessibilityElement::GetElementInfoPluralLineSupported( NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -696,7 +668,6 @@ void NAccessibilityElement::GetElementInfoPluralLineSupported( void NAccessibilityElement::GetElementInfoDeleteable(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -706,7 +677,6 @@ void NAccessibilityElement::GetElementInfoDeleteable(NAccessibilityElementData * void NAccessibilityElement::GetElementInfoIsHint(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -716,7 +686,6 @@ void NAccessibilityElement::GetElementInfoIsHint(NAccessibilityElementData *call void NAccessibilityElement::GetElementInfoIsEssential(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -726,7 +695,6 @@ void NAccessibilityElement::GetElementInfoIsEssential(NAccessibilityElementData void NAccessibilityElement::GetElementInfoItemCount(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -736,7 +704,6 @@ void NAccessibilityElement::GetElementInfoItemCount(NAccessibilityElementData *c void NAccessibilityElement::GetElementInfoCurrentIndex(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -746,7 +713,6 @@ void NAccessibilityElement::GetElementInfoCurrentIndex(NAccessibilityElementData void NAccessibilityElement::GetElementInfoStartIndex(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -756,7 +722,6 @@ void NAccessibilityElement::GetElementInfoStartIndex(NAccessibilityElementData * void NAccessibilityElement::GetElementInfoEndIndex(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -766,7 +731,6 @@ void NAccessibilityElement::GetElementInfoEndIndex(NAccessibilityElementData *ca void NAccessibilityElement::GetElementInfoValueMax(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -776,7 +740,6 @@ void NAccessibilityElement::GetElementInfoValueMax(NAccessibilityElementData *ca void NAccessibilityElement::GetElementInfoValueMin(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -786,7 +749,6 @@ void NAccessibilityElement::GetElementInfoValueMin(NAccessibilityElementData *ca void NAccessibilityElement::GetElementInfoValueNow(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -796,7 +758,6 @@ void NAccessibilityElement::GetElementInfoValueNow(NAccessibilityElementData *ca void NAccessibilityElement::GetElementInfoGrid(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } OHOS::Accessibility::GridInfo gridInfo = callbackInfo->accessibilityElement_.elementInfo_->GetGrid(); @@ -807,7 +768,6 @@ void NAccessibilityElement::GetElementInfoGrid(NAccessibilityElementData *callba void NAccessibilityElement::GetElementInfoGridItem(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } OHOS::Accessibility::GridItemInfo gridItemInfo = @@ -819,7 +779,6 @@ void NAccessibilityElement::GetElementInfoGridItem(NAccessibilityElementData *ca void NAccessibilityElement::GetElementInfoActiveRegion(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -829,7 +788,6 @@ void NAccessibilityElement::GetElementInfoActiveRegion(NAccessibilityElementData void NAccessibilityElement::GetElementInfoIsContentInvalid(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -839,7 +797,6 @@ void NAccessibilityElement::GetElementInfoIsContentInvalid(NAccessibilityElement void NAccessibilityElement::GetElementInfoError(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_, @@ -849,7 +806,6 @@ void NAccessibilityElement::GetElementInfoError(NAccessibilityElementData *callb void NAccessibilityElement::GetElementInfoLabel(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -859,7 +815,6 @@ void NAccessibilityElement::GetElementInfoLabel(NAccessibilityElementData *callb void NAccessibilityElement::GetElementInfoBeginSelected(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -869,7 +824,6 @@ void NAccessibilityElement::GetElementInfoBeginSelected(NAccessibilityElementDat void NAccessibilityElement::GetElementInfoEndSelected(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -879,7 +833,6 @@ void NAccessibilityElement::GetElementInfoEndSelected(NAccessibilityElementData void NAccessibilityElement::GetElementInfoTextMoveUnit(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } std::string textMoveUnit = ConvertTextMoveUnitToString( @@ -898,7 +851,6 @@ void NAccessibilityElement::GetElementInfoTextMoveUnit(NAccessibilityElementData void NAccessibilityElement::GetElementInfoParent(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } if (callbackInfo->ret_) { @@ -917,7 +869,6 @@ void NAccessibilityElement::GetElementInfoParent(NAccessibilityElementData *call void NAccessibilityElement::GetElementInfoChildren(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } if (callbackInfo->ret_) { @@ -932,7 +883,6 @@ void NAccessibilityElement::GetElementInfoChildren(NAccessibilityElementData *ca void NAccessibilityElement::GetElementInfoTriggerAction(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } std::string triggerAction = ConvertOperationTypeToString( @@ -951,7 +901,6 @@ void NAccessibilityElement::GetElementInfoTriggerAction(NAccessibilityElementDat void NAccessibilityElement::GetElementInfoContents(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } std::vector contents {}; @@ -972,7 +921,6 @@ void NAccessibilityElement::GetElementInfoContents(NAccessibilityElementData *ca void NAccessibilityElement::GetElementInfoLastContent(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_, @@ -982,7 +930,6 @@ void NAccessibilityElement::GetElementInfoLastContent(NAccessibilityElementData void NAccessibilityElement::GetElementInfoWindowId(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -992,7 +939,6 @@ void NAccessibilityElement::GetElementInfoWindowId(NAccessibilityElementData *ca void NAccessibilityElement::GetElementInfoIsFocused(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckElementInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -1017,7 +963,6 @@ bool NAccessibilityElement::CheckWindowInfoParameter(NAccessibilityElementData * void NAccessibilityElement::GetWindowInfoIsActive(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckWindowInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -1027,7 +972,6 @@ void NAccessibilityElement::GetWindowInfoIsActive(NAccessibilityElementData *cal void NAccessibilityElement::GetWindowInfoScreenRect(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckWindowInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } OHOS::Accessibility::Rect screenRect = callbackInfo->accessibilityElement_.windowInfo_->GetRectInScreen(); @@ -1038,7 +982,6 @@ void NAccessibilityElement::GetWindowInfoScreenRect(NAccessibilityElementData *c void NAccessibilityElement::GetWindowInfoLayer(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckWindowInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_, @@ -1048,7 +991,6 @@ void NAccessibilityElement::GetWindowInfoLayer(NAccessibilityElementData *callba void NAccessibilityElement::GetWindowInfoType(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckWindowInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } std::string accessibilityWindowType = ConvertWindowTypeToString( @@ -1067,7 +1009,6 @@ void NAccessibilityElement::GetWindowInfoType(NAccessibilityElementData *callbac void NAccessibilityElement::GetWindowInfoAnchor(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckWindowInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } if (callbackInfo->ret_) { @@ -1086,7 +1027,6 @@ void NAccessibilityElement::GetWindowInfoAnchor(NAccessibilityElementData *callb void NAccessibilityElement::GetWindowInfoRootElement(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckWindowInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } if (callbackInfo->ret_) { @@ -1105,7 +1045,6 @@ void NAccessibilityElement::GetWindowInfoRootElement(NAccessibilityElementData * void NAccessibilityElement::GetWindowInfoIsFocused(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckWindowInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_, @@ -1115,7 +1054,6 @@ void NAccessibilityElement::GetWindowInfoIsFocused(NAccessibilityElementData *ca void NAccessibilityElement::GetWindowInfoWindowId(NAccessibilityElementData *callbackInfo, napi_value &value) { if (!CheckWindowInfoParameter(callbackInfo, value)) { - HILOG_ERROR("callback info is wrong"); return; } NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_,