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

!310 无障碍告警问题对应

Browse Source 
Merge pull request !310 from Mupceet/release_0804_codeWarning
This commit is contained in:
openharmony_ci
2022-08-09 03:02:48 +00:00
committed by Gitee
parent 90a3a44332 473740f8ba
commit 464fb63ce9
11 changed files with 140 additions and 700 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/aafwk/test/BUILD.gn
+8 -1
View File
@@ -94,7 +94,14 @@ ohos_unittest("accessible_ability_test") {
"//foundation/barrierfree/accessibility/services/aams/test/mock/src/mock_accessible_ability_manager_service_state_observer_proxy.cpp",
"//foundation/barrierfree/accessibility/services/aams/test/mock/src/mock_accessible_ability_manager_service_state_observer_stub.cpp",
"//foundation/barrierfree/accessibility/services/aams/test/mock/src/mock_os_account_manager.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.cpp",
"//foundation/barrierfree/accessibility/services/interface/src/accessibility_element_operator_callback_stub.cpp",
"//foundation/barrierfree/accessibility/services/interface/src/accessible_ability_client_stub.cpp",
"//foundation/barrierfree/accessibility/services/interface/src/accessible_ability_manager_service_proxy.cpp",
"//foundation/barrierfree/accessibility/services/interface/src/parcel/accessibility_ability_info_parcel.cpp",
"//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.c",
"unittest/accessibility_element_operator_callback_impl_test.cpp",
"unittest/accessibility_ui_test_ability_impl_test.cpp",
"unittest/accessible_ability_channel_client_test.cpp",
frameworks/acfwk/src/accessibility_config_impl.cpp
+6 -8
View File
@@ -24,9 +24,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
@@ -53,12 +51,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;
}
@@ -76,8 +74,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;
@@ -90,7 +88,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;
interfaces/kits/napi/accessibility_extension_module_loader/include/napi_accessibility_element.h
+3
View File
@@ -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;
};
interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_element.cpp
+80 -484
View File
@@ -387,16 +387,24 @@ void NAccessibilityElement::AttributeValueComplete(napi_env env, napi_status sta
callbackInfo = nullptr;
}
void NAccessibilityElement::GetElementInfoComponentId(NAccessibilityElementData *callbackInfo, napi_value &value)
bool NAccessibilityElement::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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_,
@@ -405,14 +413,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_,
@@ -421,14 +422,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_,
@@ -437,14 +431,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_,
@@ -453,14 +440,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_,
@@ -469,14 +449,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_,
@@ -485,14 +458,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_,
@@ -501,14 +467,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_,
@@ -517,14 +476,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_,
@@ -533,14 +485,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_,
@@ -549,14 +494,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_,
@@ -565,14 +503,7 @@ 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)) {
return;
}
std::vector<int32_t> childIds = callbackInfo->accessibilityElement_.elementInfo_->GetChildIds();
@@ -589,14 +520,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_,
@@ -605,14 +529,7 @@ 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)) {
return;
}
OHOS::Accessibility::Rect screenRect = callbackInfo->accessibilityElement_.elementInfo_->GetRectInScreen();
@@ -622,14 +539,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_,
@@ -638,14 +548,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_,
@@ -654,14 +557,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_,
@@ -670,14 +566,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_,
@@ -687,14 +576,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_,
@@ -703,14 +585,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_,
@@ -719,14 +594,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_,
@@ -735,14 +603,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_,
@@ -751,14 +612,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_,
@@ -767,14 +621,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_,
@@ -783,14 +630,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_,
@@ -799,14 +639,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_,
@@ -815,14 +648,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_,
@@ -832,14 +658,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_,
@@ -848,14 +667,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_,
@@ -864,14 +676,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_,
@@ -880,14 +685,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_,
@@ -896,14 +694,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_,
@@ -912,14 +703,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_,
@@ -928,14 +712,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_,
@@ -944,14 +721,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_,
@@ -960,14 +730,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_,
@@ -976,14 +739,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_,
@@ -992,14 +748,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_,
@@ -1008,14 +757,7 @@ 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)) {
return;
}
OHOS::Accessibility::GridInfo gridInfo = callbackInfo->accessibilityElement_.elementInfo_->GetGrid();
@@ -1025,14 +767,7 @@ 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)) {
return;
}
OHOS::Accessibility::GridItemInfo gridItemInfo =
@@ -1043,14 +778,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_,
@@ -1059,14 +787,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_,
@@ -1075,14 +796,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_,
@@ -1091,14 +805,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_,
@@ -1107,14 +814,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_,
@@ -1123,14 +823,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_,
@@ -1139,14 +832,7 @@ 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)) {
return;
}
std::string textMoveUnit = ConvertTextMoveUnitToString(
@@ -1164,14 +850,7 @@ 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)) {
return;
}
if (callbackInfo->ret_) {
@@ -1189,14 +868,7 @@ 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)) {
return;
}
if (callbackInfo->ret_) {
@@ -1210,14 +882,7 @@ 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)) {
return;
}
std::string triggerAction = ConvertOperationTypeToString(
@@ -1235,14 +900,7 @@ 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)) {
return;
}
std::vector<std::string> contents {};
@@ -1262,14 +920,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_string_utf8(callbackInfo->env_,
@@ -1278,14 +929,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_,
@@ -1294,30 +938,31 @@ 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)) {
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 NAccessibilityElement::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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_,
@@ -1326,14 +971,7 @@ 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)) {
return;
}
OHOS::Accessibility::Rect screenRect = callbackInfo->accessibilityElement_.windowInfo_->GetRectInScreen();
@@ -1343,14 +981,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_,
@@ -1359,14 +990,7 @@ 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)) {
return;
}
std::string accessibilityWindowType = ConvertWindowTypeToString(
@@ -1384,14 +1008,7 @@ 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)) {
return;
}
if (callbackInfo->ret_) {
@@ -1409,14 +1026,7 @@ 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)) {
return;
}
if (callbackInfo->ret_) {
@@ -1434,14 +1044,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_get_boolean(callbackInfo->env_,
@@ -1450,14 +1053,7 @@ 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)) {
return;
}
NAPI_CALL_RETURN_VOID(callbackInfo->env_, napi_create_int32(callbackInfo->env_,
interfaces/kits/napi/include/napi_accessibility_utils.h
+1
View File
@@ -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);
interfaces/kits/napi/src/napi_accessibility_utils.cpp
+13 -23
View File
@@ -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, &param);
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, &param);
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;
}
services/aams/src/accessibility_account_data.cpp
+7 -6
View File
@@ -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 .");
services/aams/test/BUILD.gn
+16 -16
View File
@@ -182,8 +182,9 @@ ohos_unittest("accessibility_touch_guider_test") {
"../src/accessibility_window_connection.cpp",
"../src/accessible_ability_manager_service_event_handler.cpp",
"../src/utils.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/accessibility_element_operator_callback_stub.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/parcel/accessibility_element_info_parcel.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",
@@ -244,12 +244,12 @@ ohos_unittest("accessibility_common_event_registry_test") {
"../src/accessibility_dumper.cpp",
"../src/accessible_ability_manager_service.cpp",
"../src/utils.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/accessible_ability_channel_proxy.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/accessible_ability_client_proxy.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/accessible_ability_manager_service_stub.cpp",
"//foundation/barrierfree/accessibility/frameworks/common/src/accessibility_caption.cpp",
"//foundation/barrierfree/accessibility/frameworks/common/src/accessibility_event_info.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.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/interface/src/accessible_ability_manager_service_stub.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",
@@ -311,13 +311,13 @@ ohos_unittest("accessibility_input_interceptor_test") {
"../src/accessible_ability_manager_service.cpp",
"../src/accessible_ability_manager_service_event_handler.cpp",
"../src/utils.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/accessible_ability_channel_proxy.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/accessible_ability_client_proxy.cpp",
"//foundation/barrierfree/accessibility/frameworks/common/src/accessibility_ability_info.cpp",
"//foundation/barrierfree/accessibility/frameworks/common/src/accessibility_caption.cpp",
"//foundation/barrierfree/accessibility/frameworks/common/src/accessibility_event_info.cpp",
"//foundation/barrierfree/accessibility/frameworks/common/src/accessibility_window_info.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.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.c",
"mock/src/aafwk/mock_bundle_manager.cpp",
"mock/src/mock_accessibility_account_data.cpp",
"mock/src/mock_accessibility_gesture_recognizer.cpp",
@@ -435,11 +435,11 @@ ohos_unittest("accessibility_keyevent_filter_test") {
"../src/accessible_ability_manager_service.cpp",
"../src/accessible_ability_manager_service_event_handler.cpp",
"../src/utils.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/accessible_ability_channel_proxy.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/accessible_ability_client_proxy.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/accessible_ability_client_stub.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/accessible_ability_manager_service_stub.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.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/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.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",
services/aams/test/mock/src/mock_display_manager.cpp
-156
View File
@@ -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 <cinttypes>
#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<Display> DisplayManager::GetDisplayById(DisplayId displayId)
{
sptr<Display> display = new Display("display_mock", nullptr);
return display;
}
std::shared_ptr<Media::PixelMap> DisplayManager::GetScreenshot(DisplayId displayId)
{
return nullptr;
}
std::shared_ptr<Media::PixelMap> DisplayManager::GetScreenshot(
DisplayId displayId, const Media::Rect& rect, const Media::Size& size, int rotation)
{
return nullptr;
}
sptr<Display> DisplayManager::GetDefaultDisplay()
{
return GetDisplayById(GetDefaultDisplayId());
}
std::vector<DisplayId> DisplayManager::GetAllDisplayIds()
{
std::vector<DisplayId> res = {};
return res;
}
std::vector<sptr<Display>> DisplayManager::GetAllDisplays()
{
std::vector<sptr<Display>> res;
return res;
}
bool DisplayManager::RegisterDisplayListener(sptr<IDisplayListener> listener)
{
return true;
}
bool DisplayManager::UnregisterDisplayListener(sptr<IDisplayListener> listener)
{
return true;
}
bool DisplayManager::RegisterDisplayPowerEventListener(sptr<IDisplayPowerEventListener> listener)
{
return true;
}
bool DisplayManager::UnregisterDisplayPowerEventListener(sptr<IDisplayPowerEventListener> 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
services/test/BUILD.gn
+6 -6
View File
@@ -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",
services/test/mock/mock_parameter.cpp → services/test/mock/mock_parameter.c
View File