diff --git a/interfaces/kits/napi/src/napi_accessibility_config_observer.cpp b/frameworks/acfwk/src/accessibility_config_observer.cpp similarity index 99% rename from interfaces/kits/napi/src/napi_accessibility_config_observer.cpp rename to frameworks/acfwk/src/accessibility_config_observer.cpp index 1d89adb3..fe2d2ef2 100644 --- a/interfaces/kits/napi/src/napi_accessibility_config_observer.cpp +++ b/frameworks/acfwk/src/accessibility_config_observer.cpp @@ -13,8 +13,8 @@ * limitations under the License. */ -#include "napi_accessibility_utils.h" -#include "napi_accessibility_config_observer.h" +#include "accessibility_utils.h" +#include "accessibility_config_observer.h" #include diff --git a/interfaces/kits/napi/src/napi_accessibility_utils.cpp b/frameworks/common/src/accessibility_utils.cpp similarity index 99% rename from interfaces/kits/napi/src/napi_accessibility_utils.cpp rename to frameworks/common/src/accessibility_utils.cpp index 92ab7c62..97c7e71d 100644 --- a/interfaces/kits/napi/src/napi_accessibility_utils.cpp +++ b/frameworks/common/src/accessibility_utils.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "napi_accessibility_utils.h" +#include "accessibility_utils.h" #include #include @@ -24,7 +24,6 @@ #include "hilog_wrapper.h" #include "napi/native_api.h" #include "napi/native_node_api.h" -#include "napi_accessibility_event_info.h" namespace OHOS { namespace AccessibilityNapi { diff --git a/interfaces/innerkits/acfwk/BUILD.gn b/interfaces/innerkits/acfwk/BUILD.gn index e46deb40..d98bc13d 100755 --- a/interfaces/innerkits/acfwk/BUILD.gn +++ b/interfaces/innerkits/acfwk/BUILD.gn @@ -35,6 +35,7 @@ config("accessibilityconfig_public_config") { acfwk_src = [ "${acfwk_path}/src/accessibility_config_impl.cpp", + "${acfwk_path}/src/accessibility_config_observer.cpp", "${acfwk_path}/src/accessibility_config.cpp", ] @@ -59,6 +60,7 @@ ohos_shared_library("accessibilityconfig") { "init:libbeget_proxy", "init:libbegetutil", "ipc:ipc_core", + "napi:ace_napi", "samgr:samgr_proxy", ] diff --git a/interfaces/innerkits/acfwk/include/accessibility_config.h b/interfaces/innerkits/acfwk/include/accessibility_config.h index b4a0fca8..287515b8 100644 --- a/interfaces/innerkits/acfwk/include/accessibility_config.h +++ b/interfaces/innerkits/acfwk/include/accessibility_config.h @@ -19,6 +19,7 @@ #include #include "accessibility_caption.h" #include "accessibility_singleton.h" +#include "accessibility_def.h" namespace OHOS { namespace AccessibilityConfig { @@ -41,13 +42,6 @@ enum CONFIG_ID : int32_t { CONFIG_ID_MAX, }; -enum DALTONIZATION_TYPE : uint32_t { - Normal = 0, - Protanomaly, - Deuteranomaly, - Tritanomaly, -}; - struct ConfigValue { bool highContrastText; bool invertColor; diff --git a/interfaces/kits/napi/include/napi_accessibility_config_observer.h b/interfaces/innerkits/acfwk/include/accessibility_config_observer.h similarity index 94% rename from interfaces/kits/napi/include/napi_accessibility_config_observer.h rename to interfaces/innerkits/acfwk/include/accessibility_config_observer.h index f3b0ce84..f2b220cc 100644 --- a/interfaces/kits/napi/include/napi_accessibility_config_observer.h +++ b/interfaces/innerkits/acfwk/include/accessibility_config_observer.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef NAPI_ACCESSIBILITY_CONFIG_OBSERVER_H -#define NAPI_ACCESSIBILITY_CONFIG_OBSERVER_H +#ifndef ACCESSIBILITY_CONFIG_OBSERVER_H +#define ACCESSIBILITY_CONFIG_OBSERVER_H #include #include @@ -57,4 +57,4 @@ private: std::mutex mutex_; std::vector> observers_ = {}; }; -#endif // NAPI_ACCESSIBILITY_CONFIG_OBSERVER_H \ No newline at end of file +#endif // ACCESSIBILITY_CONFIG_OBSERVER_H \ No newline at end of file diff --git a/interfaces/innerkits/common/BUILD.gn b/interfaces/innerkits/common/BUILD.gn index 83e3f276..0bc0f523 100644 --- a/interfaces/innerkits/common/BUILD.gn +++ b/interfaces/innerkits/common/BUILD.gn @@ -39,11 +39,11 @@ accessibility_common_src = [ "${accessibility_common_path}/src/accessibility_event_info.cpp", "${accessibility_common_path}/src/accessibility_window_info.cpp", "${accessibility_common_path}/src/accessibility_gesture_inject_path.cpp", + "${accessibility_common_path}/src/accessibility_utils.cpp", ] ohos_shared_library("accessibility_common") { sources = accessibility_common_src - version_script = "libaccessibility_common.map" configs = [ ":accessibility_common_private_config", "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", @@ -53,7 +53,11 @@ ohos_shared_library("accessibility_common") { install_enable = true - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "hiviewdfx_hilog_native:libhilog", + "input:libmmi-client", + "napi:ace_napi", + ] subsystem_name = "barrierfree" part_name = "accessibility" diff --git a/interfaces/innerkits/common/include/accessibility_def.h b/interfaces/innerkits/common/include/accessibility_def.h index 5101efd9..5c52e9e7 100644 --- a/interfaces/innerkits/common/include/accessibility_def.h +++ b/interfaces/innerkits/common/include/accessibility_def.h @@ -16,8 +16,25 @@ #ifndef ACCESSIBILITY_DEFINE_H #define ACCESSIBILITY_DEFINE_H +#include +#include +#include +#include #include "accessibility_constants.h" +namespace OHOS { +namespace AccessibilityConfig { + +enum DALTONIZATION_TYPE : uint32_t { + Normal = 0, + Protanomaly, + Deuteranomaly, + Tritanomaly, +}; + +} +} + namespace OHOS { namespace Accessibility { enum RetError : int32_t { @@ -256,6 +273,99 @@ enum AccessibilityWindowType : int32_t { TYPE_SPLIT_SCREEN_DIVIDER = 0x00000008, TYPE_SYSTEM = 0x00000010, }; + } // namespace Accessibility } // namespace OHOS + +constexpr size_t CALLBACK_SIZE = 1; +constexpr size_t ARGS_SIZE_ZERO = 0; +constexpr size_t ARGS_SIZE_ONE = 1; +constexpr size_t ARGS_SIZE_TWO = 2; +constexpr size_t ARGS_SIZE_THREE = 3; +constexpr size_t ARGS_SIZE_FOUR = 4; +constexpr int32_t DEFAULT_INT32 = 0; +constexpr int32_t PARAM0 = 0; +constexpr int32_t PARAM1 = 1; +constexpr int32_t PARAM2 = 2; +constexpr int32_t CODE_SUCCESS = 0; +constexpr int32_t CODE_FAILED = -1; +constexpr int32_t CHAE_BUFFER_MAX = 1024; +const std::string ERROR_MESSAGE_PARAMETER_ERROR = "Input parameter error"; +const std::string ERROR_MESSAGE_NO_PERMISSION = "Permission denied"; +const std::string ERROR_MESSAGE_NOT_SYSTEM_APP = "Not system App"; +const std::string ERROR_MESSAGE_NO_RIGHT = "Do not have accessibility right for this operation"; +const std::string ERROR_MESSAGE_SYSTEM_ABNORMALITY = "System abnormality"; +const std::string ERROR_MESSAGE_PROPERTY_NOT_EXIST = "This property does not exist"; +const std::string ERROR_MESSAGE_ACTION_NOT_SUPPORT = "This action is not supported"; +const std::string ERROR_MESSAGE_INVALID_BUNDLE_NAME_OR_ABILITY_NAME = "Invalid bundle name or ability name"; +const std::string ERROR_MESSAGE_TARGET_ABILITY_ALREADY_ENABLED = "Target ability already enabled"; + +enum class NAccessibilityErrorCode : int32_t { + ACCESSIBILITY_OK = 0, + ACCESSIBILITY_ERROR_NO_PERMISSION = 201, + ACCESSIBILITY_ERROR_NOT_SYSTEM_APP = 202, + ACCESSIBILITY_ERROR_INVALID_PARAM = 401, + ACCESSIBILITY_ERROR_SYSTEM_ABNORMALITY = 9300000, + ACCESSIBILITY_ERROR_ERROR_EXTENSION_NAME = 9300001, + ACCESSIBILITY_ERROR_TARGET_ABILITY_ALREADY_ENABLED = 9300002, + ACCESSIBILITY_ERROR_NO_RIGHT = 9300003, + ACCESSIBILITY_ERROR_PROPERTY_NOT_EXIST = 9300004, + ACCESSIBILITY_ERROR_ACTION_NOT_SUPPORT = 9300005, +}; + +struct NAccessibilityErrMsg { + NAccessibilityErrorCode errCode; + std::string message; +}; + +const std::map ACCESSIBILITY_JS_TO_ERROR_CODE_MAP { + {OHOS::Accessibility::RetError::RET_OK, + {NAccessibilityErrorCode::ACCESSIBILITY_OK, ""}}, + {OHOS::Accessibility::RetError::RET_ERR_FAILED, + {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_SYSTEM_ABNORMALITY, ERROR_MESSAGE_SYSTEM_ABNORMALITY}}, + {OHOS::Accessibility::RetError::RET_ERR_INVALID_PARAM, + {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_INVALID_PARAM, ERROR_MESSAGE_PARAMETER_ERROR}}, + {OHOS::Accessibility::RetError::RET_ERR_NULLPTR, + {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_SYSTEM_ABNORMALITY, ERROR_MESSAGE_SYSTEM_ABNORMALITY}}, + {OHOS::Accessibility::RetError::RET_ERR_IPC_FAILED, + {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_SYSTEM_ABNORMALITY, ERROR_MESSAGE_SYSTEM_ABNORMALITY}}, + {OHOS::Accessibility::RetError::RET_ERR_SAMGR, + {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_SYSTEM_ABNORMALITY, ERROR_MESSAGE_SYSTEM_ABNORMALITY}}, + {OHOS::Accessibility::RetError::RET_ERR_NO_PERMISSION, + {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_NO_PERMISSION, ERROR_MESSAGE_NO_PERMISSION}}, + {OHOS::Accessibility::RetError::RET_ERR_TIME_OUT, + {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_SYSTEM_ABNORMALITY, ERROR_MESSAGE_SYSTEM_ABNORMALITY}}, + {OHOS::Accessibility::RetError::RET_ERR_REGISTER_EXIST, + {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_SYSTEM_ABNORMALITY, ERROR_MESSAGE_SYSTEM_ABNORMALITY}}, + {OHOS::Accessibility::RetError::RET_ERR_NO_REGISTER, + {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_SYSTEM_ABNORMALITY, ERROR_MESSAGE_SYSTEM_ABNORMALITY}}, + {OHOS::Accessibility::RetError::RET_ERR_CONNECTION_EXIST, + {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_TARGET_ABILITY_ALREADY_ENABLED, + ERROR_MESSAGE_TARGET_ABILITY_ALREADY_ENABLED}}, + {OHOS::Accessibility::RetError::RET_ERR_NO_CONNECTION, + {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_SYSTEM_ABNORMALITY, ERROR_MESSAGE_SYSTEM_ABNORMALITY}}, + {OHOS::Accessibility::RetError::RET_ERR_NO_WINDOW_CONNECTION, + {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_SYSTEM_ABNORMALITY, ERROR_MESSAGE_SYSTEM_ABNORMALITY}}, + {OHOS::Accessibility::RetError::RET_ERR_NO_CAPABILITY, + {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_NO_RIGHT, ERROR_MESSAGE_NO_RIGHT}}, + {OHOS::Accessibility::RetError::RET_ERR_INVALID_ELEMENT_INFO_FROM_ACE, + {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_SYSTEM_ABNORMALITY, ERROR_MESSAGE_SYSTEM_ABNORMALITY}}, + {OHOS::Accessibility::RetError::RET_ERR_PERFORM_ACTION_FAILED_BY_ACE, + {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_SYSTEM_ABNORMALITY, ERROR_MESSAGE_SYSTEM_ABNORMALITY}}, + {OHOS::Accessibility::RetError::RET_ERR_NO_INJECTOR, + {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_SYSTEM_ABNORMALITY, ERROR_MESSAGE_SYSTEM_ABNORMALITY}}, + {OHOS::Accessibility::RetError::RET_ERR_NOT_INSTALLED, + {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_ERROR_EXTENSION_NAME, + ERROR_MESSAGE_INVALID_BUNDLE_NAME_OR_ABILITY_NAME}}, + {OHOS::Accessibility::RetError::RET_ERR_NOT_ENABLED, + {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_ERROR_EXTENSION_NAME, + ERROR_MESSAGE_INVALID_BUNDLE_NAME_OR_ABILITY_NAME}}, + {OHOS::Accessibility::RetError::RET_ERR_PROPERTY_NOT_EXIST, + {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_PROPERTY_NOT_EXIST, ERROR_MESSAGE_PROPERTY_NOT_EXIST}}, + {OHOS::Accessibility::RetError::RET_ERR_ACTION_NOT_SUPPORT, + {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_ACTION_NOT_SUPPORT, ERROR_MESSAGE_ACTION_NOT_SUPPORT}}, + {OHOS::Accessibility::RetError::RET_ERR_NOT_SYSTEM_APP, + {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_NOT_SYSTEM_APP, ERROR_MESSAGE_NOT_SYSTEM_APP}}, +}; + #endif // ACCESSIBILITY_DEFINE_H \ No newline at end of file diff --git a/interfaces/kits/napi/include/napi_accessibility_utils.h b/interfaces/innerkits/common/include/accessibility_utils.h similarity index 96% rename from interfaces/kits/napi/include/napi_accessibility_utils.h rename to interfaces/innerkits/common/include/accessibility_utils.h index 40431995..5ea7b9a3 100644 --- a/interfaces/kits/napi/include/napi_accessibility_utils.h +++ b/interfaces/innerkits/common/include/accessibility_utils.h @@ -13,13 +13,12 @@ * limitations under the License. */ -#ifndef NAPI_ACCESSIBILITY_UTILS_H -#define NAPI_ACCESSIBILITY_UTILS_H +#ifndef ACCESSIBILITY_UTILS_H +#define ACCESSIBILITY_UTILS_H #include #include "accessibility_ability_info.h" #include "accessibility_caption.h" -#include "accessibility_config.h" #include "accessibility_element_info.h" #include "accessibility_event_info.h" #include "accessibility_gesture_inject_path.h" @@ -27,7 +26,7 @@ #include "key_event.h" #include "napi/native_api.h" #include "napi/native_node_api.h" -#include "napi_accessibility_def.h" +#include "accessibility_def.h" namespace OHOS { namespace AccessibilityNapi { @@ -111,4 +110,4 @@ struct CaptionCallbackInfo: public AccessibilityCallbackInfo { }; } // namespace AccessibilityNapi } // OHOS -#endif // NAPI_ACCESSIBILITY_UTILS_H \ No newline at end of file +#endif // ACCESSIBILITY_UTILS_H \ No newline at end of file diff --git a/interfaces/kits/napi/BUILD.gn b/interfaces/kits/napi/BUILD.gn index 7c74f1b4..b87ea0a6 100644 --- a/interfaces/kits/napi/BUILD.gn +++ b/interfaces/kits/napi/BUILD.gn @@ -27,10 +27,8 @@ ohos_shared_library("accessibility") { ] sources = [ - "./src/napi_accessibility_config_observer.cpp", "./src/napi_accessibility_event_info.cpp", "./src/napi_accessibility_system_ability_client.cpp", - "./src/napi_accessibility_utils.cpp", "./src/native_module.cpp", ] diff --git a/interfaces/kits/napi/accessibility_config/include/napi_accessibility_config.h b/interfaces/kits/napi/accessibility_config/include/napi_accessibility_config.h index eddec93a..ba3a66e9 100644 --- a/interfaces/kits/napi/accessibility_config/include/napi_accessibility_config.h +++ b/interfaces/kits/napi/accessibility_config/include/napi_accessibility_config.h @@ -19,8 +19,8 @@ #include #include #include -#include "napi_accessibility_utils.h" -#include "napi_accessibility_config_observer.h" +#include "accessibility_utils.h" +#include "accessibility_config_observer.h" #include "napi/native_api.h" #include "napi/native_node_api.h" #include "accessibility_config.h" diff --git a/interfaces/kits/napi/accessibility_config/src/napi_accessibility_config.cpp b/interfaces/kits/napi/accessibility_config/src/napi_accessibility_config.cpp index f8943efc..756766f5 100644 --- a/interfaces/kits/napi/accessibility_config/src/napi_accessibility_config.cpp +++ b/interfaces/kits/napi/accessibility_config/src/napi_accessibility_config.cpp @@ -18,7 +18,7 @@ #include #include "hilog_wrapper.h" #include "ipc_skeleton.h" -#include "napi_accessibility_utils.h" +#include "accessibility_utils.h" #include "tokenid_kit.h" using namespace OHOS; 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 a293323c..b36315e0 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 @@ -16,7 +16,7 @@ #ifndef NAPI_ACCESSIBILITY_ELEMENT_H #define NAPI_ACCESSIBILITY_ELEMENT_H -#include "napi_accessibility_def.h" +#include "accessibility_def.h" #include "accessibility_event_info.h" #include "accessibility_window_info.h" #include "napi/native_api.h" 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 01ca386d..5795fc4b 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 @@ -19,7 +19,7 @@ #include #include "accessible_ability_client.h" #include "hilog_wrapper.h" -#include "napi_accessibility_utils.h" +#include "accessibility_utils.h" using namespace OHOS; using namespace OHOS::Accessibility; diff --git a/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_extension.cpp b/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_extension.cpp index 9f0dc0e5..ed4177c9 100644 --- a/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_extension.cpp +++ b/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_extension.cpp @@ -23,7 +23,7 @@ #include "js_runtime_utils.h" #include "napi_accessibility_event_info.h" #include "napi_accessibility_extension_context.h" -#include "napi_accessibility_utils.h" +#include "accessibility_utils.h" #include "napi/native_api.h" #include "napi/native_node_api.h" #include "napi_accessibility_element.h" 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 f11f02fa..dde55f90 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 @@ -21,7 +21,7 @@ #include "js_runtime_utils.h" #include "hilog_wrapper.h" #include "napi_accessibility_element.h" -#include "napi_accessibility_utils.h" +#include "accessibility_utils.h" #include "native_engine/native_value.h" using namespace OHOS::AbilityRuntime; diff --git a/interfaces/kits/napi/accessibility_gesture_path/src/napi_accessibility_gesture_path.cpp b/interfaces/kits/napi/accessibility_gesture_path/src/napi_accessibility_gesture_path.cpp index 53f85aab..810c683e 100644 --- a/interfaces/kits/napi/accessibility_gesture_path/src/napi_accessibility_gesture_path.cpp +++ b/interfaces/kits/napi/accessibility_gesture_path/src/napi_accessibility_gesture_path.cpp @@ -14,7 +14,7 @@ */ #include "napi_accessibility_gesture_path.h" -#include "napi_accessibility_def.h" +#include "accessibility_def.h" #include "hilog_wrapper.h" using namespace OHOS; diff --git a/interfaces/kits/napi/accessibility_gesture_point/src/napi_accessibility_gesture_point.cpp b/interfaces/kits/napi/accessibility_gesture_point/src/napi_accessibility_gesture_point.cpp index 1951ba65..bcc98f36 100644 --- a/interfaces/kits/napi/accessibility_gesture_point/src/napi_accessibility_gesture_point.cpp +++ b/interfaces/kits/napi/accessibility_gesture_point/src/napi_accessibility_gesture_point.cpp @@ -14,7 +14,7 @@ */ #include "napi_accessibility_gesture_point.h" -#include "napi_accessibility_def.h" +#include "accessibility_def.h" #include "hilog_wrapper.h" using namespace OHOS; diff --git a/interfaces/kits/napi/include/napi_accessibility_def.h b/interfaces/kits/napi/include/napi_accessibility_def.h deleted file mode 100644 index ea5c5cf1..00000000 --- a/interfaces/kits/napi/include/napi_accessibility_def.h +++ /dev/null @@ -1,115 +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. - */ - -#ifndef NAPI_ACCESSIBILITY_DEF_H -#define NAPI_ACCESSIBILITY_DEF_H - -#include -#include -#include -#include -#include "accessibility_def.h" - -constexpr size_t CALLBACK_SIZE = 1; -constexpr size_t ARGS_SIZE_ZERO = 0; -constexpr size_t ARGS_SIZE_ONE = 1; -constexpr size_t ARGS_SIZE_TWO = 2; -constexpr size_t ARGS_SIZE_THREE = 3; -constexpr size_t ARGS_SIZE_FOUR = 4; -constexpr int32_t DEFAULT_INT32 = 0; -constexpr int32_t PARAM0 = 0; -constexpr int32_t PARAM1 = 1; -constexpr int32_t PARAM2 = 2; -constexpr int32_t CODE_SUCCESS = 0; -constexpr int32_t CODE_FAILED = -1; -constexpr int32_t CHAE_BUFFER_MAX = 1024; -const std::string ERROR_MESSAGE_PARAMETER_ERROR = "Input parameter error"; -const std::string ERROR_MESSAGE_NO_PERMISSION = "Permission denied"; -const std::string ERROR_MESSAGE_NOT_SYSTEM_APP = "Not system App"; -const std::string ERROR_MESSAGE_NO_RIGHT = "Do not have accessibility right for this operation"; -const std::string ERROR_MESSAGE_SYSTEM_ABNORMALITY = "System abnormality"; -const std::string ERROR_MESSAGE_PROPERTY_NOT_EXIST = "This property does not exist"; -const std::string ERROR_MESSAGE_ACTION_NOT_SUPPORT = "This action is not supported"; -const std::string ERROR_MESSAGE_INVALID_BUNDLE_NAME_OR_ABILITY_NAME = "Invalid bundle name or ability name"; -const std::string ERROR_MESSAGE_TARGET_ABILITY_ALREADY_ENABLED = "Target ability already enabled"; - -enum class NAccessibilityErrorCode : int32_t { - ACCESSIBILITY_OK = 0, - ACCESSIBILITY_ERROR_NO_PERMISSION = 201, - ACCESSIBILITY_ERROR_NOT_SYSTEM_APP = 202, - ACCESSIBILITY_ERROR_INVALID_PARAM = 401, - ACCESSIBILITY_ERROR_SYSTEM_ABNORMALITY = 9300000, - ACCESSIBILITY_ERROR_ERROR_EXTENSION_NAME = 9300001, - ACCESSIBILITY_ERROR_TARGET_ABILITY_ALREADY_ENABLED = 9300002, - ACCESSIBILITY_ERROR_NO_RIGHT = 9300003, - ACCESSIBILITY_ERROR_PROPERTY_NOT_EXIST = 9300004, - ACCESSIBILITY_ERROR_ACTION_NOT_SUPPORT = 9300005, -}; - -struct NAccessibilityErrMsg { - NAccessibilityErrorCode errCode; - std::string message; -}; - -const std::map ACCESSIBILITY_JS_TO_ERROR_CODE_MAP { - {OHOS::Accessibility::RetError::RET_OK, - {NAccessibilityErrorCode::ACCESSIBILITY_OK, ""}}, - {OHOS::Accessibility::RetError::RET_ERR_FAILED, - {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_SYSTEM_ABNORMALITY, ERROR_MESSAGE_SYSTEM_ABNORMALITY}}, - {OHOS::Accessibility::RetError::RET_ERR_INVALID_PARAM, - {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_INVALID_PARAM, ERROR_MESSAGE_PARAMETER_ERROR}}, - {OHOS::Accessibility::RetError::RET_ERR_NULLPTR, - {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_SYSTEM_ABNORMALITY, ERROR_MESSAGE_SYSTEM_ABNORMALITY}}, - {OHOS::Accessibility::RetError::RET_ERR_IPC_FAILED, - {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_SYSTEM_ABNORMALITY, ERROR_MESSAGE_SYSTEM_ABNORMALITY}}, - {OHOS::Accessibility::RetError::RET_ERR_SAMGR, - {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_SYSTEM_ABNORMALITY, ERROR_MESSAGE_SYSTEM_ABNORMALITY}}, - {OHOS::Accessibility::RetError::RET_ERR_NO_PERMISSION, - {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_NO_PERMISSION, ERROR_MESSAGE_NO_PERMISSION}}, - {OHOS::Accessibility::RetError::RET_ERR_TIME_OUT, - {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_SYSTEM_ABNORMALITY, ERROR_MESSAGE_SYSTEM_ABNORMALITY}}, - {OHOS::Accessibility::RetError::RET_ERR_REGISTER_EXIST, - {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_SYSTEM_ABNORMALITY, ERROR_MESSAGE_SYSTEM_ABNORMALITY}}, - {OHOS::Accessibility::RetError::RET_ERR_NO_REGISTER, - {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_SYSTEM_ABNORMALITY, ERROR_MESSAGE_SYSTEM_ABNORMALITY}}, - {OHOS::Accessibility::RetError::RET_ERR_CONNECTION_EXIST, - {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_TARGET_ABILITY_ALREADY_ENABLED, - ERROR_MESSAGE_TARGET_ABILITY_ALREADY_ENABLED}}, - {OHOS::Accessibility::RetError::RET_ERR_NO_CONNECTION, - {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_SYSTEM_ABNORMALITY, ERROR_MESSAGE_SYSTEM_ABNORMALITY}}, - {OHOS::Accessibility::RetError::RET_ERR_NO_WINDOW_CONNECTION, - {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_SYSTEM_ABNORMALITY, ERROR_MESSAGE_SYSTEM_ABNORMALITY}}, - {OHOS::Accessibility::RetError::RET_ERR_NO_CAPABILITY, - {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_NO_RIGHT, ERROR_MESSAGE_NO_RIGHT}}, - {OHOS::Accessibility::RetError::RET_ERR_INVALID_ELEMENT_INFO_FROM_ACE, - {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_SYSTEM_ABNORMALITY, ERROR_MESSAGE_SYSTEM_ABNORMALITY}}, - {OHOS::Accessibility::RetError::RET_ERR_PERFORM_ACTION_FAILED_BY_ACE, - {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_SYSTEM_ABNORMALITY, ERROR_MESSAGE_SYSTEM_ABNORMALITY}}, - {OHOS::Accessibility::RetError::RET_ERR_NO_INJECTOR, - {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_SYSTEM_ABNORMALITY, ERROR_MESSAGE_SYSTEM_ABNORMALITY}}, - {OHOS::Accessibility::RetError::RET_ERR_NOT_INSTALLED, - {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_ERROR_EXTENSION_NAME, - ERROR_MESSAGE_INVALID_BUNDLE_NAME_OR_ABILITY_NAME}}, - {OHOS::Accessibility::RetError::RET_ERR_NOT_ENABLED, - {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_ERROR_EXTENSION_NAME, - ERROR_MESSAGE_INVALID_BUNDLE_NAME_OR_ABILITY_NAME}}, - {OHOS::Accessibility::RetError::RET_ERR_PROPERTY_NOT_EXIST, - {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_PROPERTY_NOT_EXIST, ERROR_MESSAGE_PROPERTY_NOT_EXIST}}, - {OHOS::Accessibility::RetError::RET_ERR_ACTION_NOT_SUPPORT, - {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_ACTION_NOT_SUPPORT, ERROR_MESSAGE_ACTION_NOT_SUPPORT}}, - {OHOS::Accessibility::RetError::RET_ERR_NOT_SYSTEM_APP, - {NAccessibilityErrorCode::ACCESSIBILITY_ERROR_NOT_SYSTEM_APP, ERROR_MESSAGE_NOT_SYSTEM_APP}}, -}; -#endif // NAPI_ACCESSIBILITY_DEF_H \ No newline at end of file diff --git a/interfaces/kits/napi/include/napi_accessibility_system_ability_client.h b/interfaces/kits/napi/include/napi_accessibility_system_ability_client.h index 457f76dd..16f447cf 100644 --- a/interfaces/kits/napi/include/napi_accessibility_system_ability_client.h +++ b/interfaces/kits/napi/include/napi_accessibility_system_ability_client.h @@ -24,8 +24,8 @@ #include "accessibility_system_ability_client.h" #include "accessibility_state_event.h" #include "accessibility_ability_info.h" -#include "napi_accessibility_utils.h" -#include "napi_accessibility_config_observer.h" +#include "accessibility_utils.h" +#include "accessibility_config_observer.h" const uint32_t START_WORK_ARGS_SIZE = 2; struct StateListener { diff --git a/interfaces/kits/napi/src/napi_accessibility_event_info.cpp b/interfaces/kits/napi/src/napi_accessibility_event_info.cpp index ca529b57..bae5c770 100644 --- a/interfaces/kits/napi/src/napi_accessibility_event_info.cpp +++ b/interfaces/kits/napi/src/napi_accessibility_event_info.cpp @@ -15,7 +15,7 @@ #include "napi_accessibility_event_info.h" #include "hilog_wrapper.h" -#include "napi_accessibility_utils.h" +#include "accessibility_utils.h" using namespace OHOS; using namespace OHOS::Accessibility; diff --git a/interfaces/kits/napi/src/napi_accessibility_system_ability_client.cpp b/interfaces/kits/napi/src/napi_accessibility_system_ability_client.cpp index 15b8c46d..019e846e 100644 --- a/interfaces/kits/napi/src/napi_accessibility_system_ability_client.cpp +++ b/interfaces/kits/napi/src/napi_accessibility_system_ability_client.cpp @@ -18,7 +18,7 @@ #include #include "accessibility_state_event.h" #include "hilog_wrapper.h" -#include "napi_accessibility_utils.h" +#include "accessibility_utils.h" using namespace OHOS; using namespace OHOS::Accessibility;