From 87da81d5dfdf7029e5b095777a2206adfc75480e Mon Sep 17 00:00:00 2001 From: Mupceet Date: Mon, 20 Jun 2022 18:23:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=AE=BE=E5=AE=9AeventFi?= =?UTF-8?q?lter=E7=9B=B8=E5=85=B3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mupceet --- .../include/accessibility_ability_info.h | 2 +- .../napi_accessibility_extension_context.cpp | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/interfaces/innerkits/common/include/accessibility_ability_info.h b/interfaces/innerkits/common/include/accessibility_ability_info.h index 39cc4c481..56c82bb5f 100644 --- a/interfaces/innerkits/common/include/accessibility_ability_info.h +++ b/interfaces/innerkits/common/include/accessibility_ability_info.h @@ -171,7 +171,7 @@ protected: std::string settingsAbility_; uint32_t abilityTypes_ = ACCESSIBILITY_ABILITY_TYPE_INVALID; - uint32_t eventTypes_ = EventType::TYPES_ALL_MASK; + uint32_t eventTypes_ = EventType::TYPE_VIEW_INVALID; std::vector targetBundleNames_; }; diff --git a/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_extension_context.cpp b/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_extension_context.cpp index a66c0c6a5..2d92e14e1 100644 --- a/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_extension_context.cpp +++ b/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_extension_context.cpp @@ -141,10 +141,6 @@ private: uint32_t filter = TYPE_VIEW_INVALID; ConvertJSToEventTypes(reinterpret_cast(&engine), reinterpret_cast(info.argv[PARAM0]), filter); - if (filter == TYPE_VIEW_INVALID) { - HILOG_ERROR("ConvertJSToEventTypes failed"); - return engine.CreateUndefined(); - } HILOG_INFO("filter = %{public}d", filter); AsyncTask::CompleteCallback complete = @@ -156,13 +152,17 @@ private: task.Reject(engine, CreateJsError(engine, ERROR_CODE_ONE, "Context is released")); return; } - + if (filter == TYPE_VIEW_INVALID) { + HILOG_ERROR("filter is invalid"); + task.Reject(engine, CreateJsError(engine, ERROR_CODE_ONE, "filter is invalid")); + return; + } bool ret = context->SetEventTypeFilter(filter); if (ret) { task.Resolve(engine, engine.CreateBoolean(ret)); } else { HILOG_ERROR("set event type failed. ret: %{public}d.", ret); - task.Reject(engine, CreateJsError(engine, false, "set event type failed.")); + task.Reject(engine, CreateJsError(engine, ERROR_CODE_ONE, "set event type failed.")); } }; @@ -203,7 +203,7 @@ private: task.Resolve(engine, engine.CreateBoolean(ret)); } else { HILOG_ERROR("set target bundle name failed. ret: %{public}d.", ret); - task.Reject(engine, CreateJsError(engine, false, "set target bundle name failed.")); + task.Reject(engine, CreateJsError(engine, ERROR_CODE_ONE, "set target bundle name failed.")); } }; @@ -273,7 +273,7 @@ private: task.Resolve(engine, nativeElementInfo); } else { HILOG_ERROR("Get focus elementInfo failed. ret: %{public}d", ret); - task.Reject(engine, CreateJsError(engine, false, "Get focus elementInfo failed.")); + task.Reject(engine, CreateJsError(engine, ERROR_CODE_ONE, "Get focus elementInfo failed.")); } }; @@ -513,7 +513,7 @@ private: task.Resolve(engine, engine.CreateBoolean(ret)); } else { HILOG_ERROR("Perform common action failed. ret: %{public}d.", ret); - task.Reject(engine, CreateJsError(engine, false, "Perform common action failed.")); + task.Reject(engine, CreateJsError(engine, ERROR_CODE_ONE, "Perform common action failed.")); } }; @@ -578,7 +578,7 @@ private: task.Resolve(engine, engine.CreateBoolean(ret)); } else { HILOG_ERROR("Gesture inject failed. ret: %{public}d.", ret); - task.Reject(engine, CreateJsError(engine, false, "Gesture inject failed.")); + task.Reject(engine, CreateJsError(engine, ERROR_CODE_ONE, "Gesture inject failed.")); } }; From aacbf372924882919d16c20dd9043d315967a311 Mon Sep 17 00:00:00 2001 From: Mupceet Date: Tue, 21 Jun 2022 11:49:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3pr=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 --- .../napi_accessibility_extension_context.cpp | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_extension_context.cpp b/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_extension_context.cpp index 2d92e14e1..844d7c7db 100644 --- a/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_extension_context.cpp +++ b/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_extension_context.cpp @@ -28,7 +28,9 @@ using namespace OHOS::AbilityRuntime; namespace OHOS { namespace Accessibility { namespace { -constexpr int32_t ERROR_CODE_ONE = 1; +constexpr int32_t CONTEXT_ERROR = 1; +constexpr int32_t PARAMETER_ERROR = 2; +constexpr int32_t RESULT_ERROR = 3; static void ConvertAccessibilityWindowInfoToJS( napi_env env, napi_value result, const AccessibilityWindowInfo& accessibilityWindowInfo) @@ -149,12 +151,12 @@ private: auto context = weak.lock(); if (!context) { HILOG_ERROR("context is released"); - task.Reject(engine, CreateJsError(engine, ERROR_CODE_ONE, "Context is released")); + task.Reject(engine, CreateJsError(engine, CONTEXT_ERROR, "Context is released")); return; } if (filter == TYPE_VIEW_INVALID) { HILOG_ERROR("filter is invalid"); - task.Reject(engine, CreateJsError(engine, ERROR_CODE_ONE, "filter is invalid")); + task.Reject(engine, CreateJsError(engine, PARAMETER_ERROR, "filter is invalid")); return; } bool ret = context->SetEventTypeFilter(filter); @@ -162,7 +164,7 @@ private: task.Resolve(engine, engine.CreateBoolean(ret)); } else { HILOG_ERROR("set event type failed. ret: %{public}d.", ret); - task.Reject(engine, CreateJsError(engine, ERROR_CODE_ONE, "set event type failed.")); + task.Reject(engine, CreateJsError(engine, RESULT_ERROR, "set event type failed.")); } }; @@ -194,7 +196,7 @@ private: auto context = weak.lock(); if (!context) { HILOG_ERROR("context is released"); - task.Reject(engine, CreateJsError(engine, ERROR_CODE_ONE, "Context is released")); + task.Reject(engine, CreateJsError(engine, CONTEXT_ERROR, "Context is released")); return; } @@ -203,7 +205,7 @@ private: task.Resolve(engine, engine.CreateBoolean(ret)); } else { HILOG_ERROR("set target bundle name failed. ret: %{public}d.", ret); - task.Reject(engine, CreateJsError(engine, ERROR_CODE_ONE, "set target bundle name failed.")); + task.Reject(engine, CreateJsError(engine, RESULT_ERROR, "set target bundle name failed.")); } }; @@ -255,7 +257,7 @@ private: auto context = weak.lock(); if (!context) { HILOG_ERROR("context is released"); - task.Reject(engine, CreateJsError(engine, ERROR_CODE_ONE, "Context is released")); + task.Reject(engine, CreateJsError(engine, CONTEXT_ERROR, "Context is released")); return; } @@ -273,7 +275,7 @@ private: task.Resolve(engine, nativeElementInfo); } else { HILOG_ERROR("Get focus elementInfo failed. ret: %{public}d", ret); - task.Reject(engine, CreateJsError(engine, ERROR_CODE_ONE, "Get focus elementInfo failed.")); + task.Reject(engine, CreateJsError(engine, RESULT_ERROR, "Get focus elementInfo failed.")); } }; @@ -322,13 +324,12 @@ private: auto context = weak.lock(); if (!context) { HILOG_ERROR("context is released"); - task.Reject(engine, CreateJsError(engine, ERROR_CODE_ONE, "Context is released")); + task.Reject(engine, CreateJsError(engine, CONTEXT_ERROR, "Context is released")); return; } bool isActiveWindow = (windowId == INVALID_WINDOW_ID) ? true : false; HILOG_DEBUG("isActiveWindow[%{public}d] windowId[%{public}d]", isActiveWindow, windowId); - OHOS::Accessibility::AccessibilityElementInfo elementInfo; bool ret = false; if (isActiveWindow) { @@ -352,7 +353,7 @@ private: task.Resolve(engine, nativeElementInfo); } else { HILOG_ERROR("Get root elementInfo failed. ret : %{public}d", ret); - task.Reject(engine, CreateJsError(engine, false, "Get root elementInfo failed.")); + task.Reject(engine, CreateJsError(engine, RESULT_ERROR, "Get root elementInfo failed.")); } }; @@ -419,7 +420,7 @@ private: auto context = weak.lock(); if (!context) { HILOG_ERROR("context is released"); - task.Reject(engine, CreateJsError(engine, ERROR_CODE_ONE, "Context is released")); + task.Reject(engine, CreateJsError(engine, CONTEXT_ERROR, "Context is released")); return; } @@ -434,7 +435,7 @@ private: task.Resolve(engine, nativeWindowInfos); } else { HILOG_ERROR("Get windowInfos failed."); - task.Reject(engine, CreateJsError(engine, false, "Get windowInfos failed.")); + task.Reject(engine, CreateJsError(engine, RESULT_ERROR, "Get windowInfos failed.")); } }; @@ -453,7 +454,7 @@ private: auto context = weak.lock(); if (!context) { HILOG_ERROR("context is released"); - task.Reject(engine, CreateJsError(engine, ERROR_CODE_ONE, "Context is released")); + task.Reject(engine, CreateJsError(engine, CONTEXT_ERROR, "Context is released")); return; } @@ -468,7 +469,7 @@ private: task.Resolve(engine, nativeWindowInfos); } else { HILOG_ERROR("Get windowInfos failed."); - task.Reject(engine, CreateJsError(engine, false, "Get windowInfos failed.")); + task.Reject(engine, CreateJsError(engine, RESULT_ERROR, "Get windowInfos failed.")); } }; @@ -504,7 +505,7 @@ private: auto context = weak.lock(); if (!context) { HILOG_ERROR("context is released"); - task.Reject(engine, CreateJsError(engine, ERROR_CODE_ONE, "Context is released")); + task.Reject(engine, CreateJsError(engine, CONTEXT_ERROR, "Context is released")); return; } @@ -513,7 +514,7 @@ private: task.Resolve(engine, engine.CreateBoolean(ret)); } else { HILOG_ERROR("Perform common action failed. ret: %{public}d.", ret); - task.Reject(engine, CreateJsError(engine, ERROR_CODE_ONE, "Perform common action failed.")); + task.Reject(engine, CreateJsError(engine, RESULT_ERROR, "Perform common action failed.")); } }; @@ -565,7 +566,7 @@ private: auto context = weak.lock(); if (!context) { HILOG_ERROR("context is released"); - task.Reject(engine, CreateJsError(engine, ERROR_CODE_ONE, "Context is released")); + task.Reject(engine, CreateJsError(engine, CONTEXT_ERROR, "Context is released")); return; } bool ret = false; @@ -578,7 +579,7 @@ private: task.Resolve(engine, engine.CreateBoolean(ret)); } else { HILOG_ERROR("Gesture inject failed. ret: %{public}d.", ret); - task.Reject(engine, CreateJsError(engine, ERROR_CODE_ONE, "Gesture inject failed.")); + task.Reject(engine, CreateJsError(engine, RESULT_ERROR, "Gesture inject failed.")); } };