!307 无障碍子系统支持fwk、service解耦

Merge pull request !307 from xiahaiqin/master

bundle.json

@@ -44,17 +44,23 @@
       "third_party": []
     },
     "build": {
-      "sub_component": [
-        "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms",
-        "//foundation/barrierfree/accessibility/services/interface:aams_interface",
-        "//foundation/barrierfree/accessibility/interfaces/innerkits/aafwk:accessibleability",
-        "//foundation/barrierfree/accessibility/interfaces/innerkits/acfwk:accessibilityconfig",
-        "//foundation/barrierfree/accessibility/interfaces/innerkits/asacfwk:accessibilityclient",
-        "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common",
-        "//foundation/barrierfree/accessibility/interfaces/kits/napi:napi_packages",
-        "//foundation/barrierfree/accessibility/sa_profile:aams_sa_profile",
-        "//foundation/barrierfree/accessibility/sa_profile:accessibility_cfg"
-      ],
+      "group_type": {
+        "base_group": [
+          "//foundation/barrierfree/accessibility/interfaces/kits/napi:napi_packages"
+        ],
+        "fwk_group": [
+          "//foundation/barrierfree/accessibility/interfaces/innerkits/aafwk:accessibleability",
+          "//foundation/barrierfree/accessibility/interfaces/innerkits/acfwk:accessibilityconfig",
+          "//foundation/barrierfree/accessibility/interfaces/innerkits/asacfwk:accessibilityclient",
+          "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common",
+          "//foundation/barrierfree/accessibility/common/interface:accessibility_interface"
+        ],
+        "service_group": [
+          "//foundation/barrierfree/accessibility/sa_profile:aams_sa_profile",
+          "//foundation/barrierfree/accessibility/sa_profile:accessibility_cfg",
+          "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms"
+        ]
+      },
       "inner_kits": [
         {
           "type": "so",

common/interface/BUILD.gn

@@ -13,13 +13,13 @@
 
 import("//build/ohos.gni")
 
-config("aams_interface_private_config") {
+config("accessibility_interface_private_config") {
   visibility = [ ":*" ]
 
   include_dirs = [ "//foundation/barrierfree/accessibility/common/log/include" ]
 
   defines = [
-    "AAMS_LOG_TAG = \"aams_interface\"",
+    "AAMS_LOG_TAG = \"accessibility_interface\"",
     "AAMS_LOG_DOMAIN = 0xD001D02",
   ]
 
@@ -28,14 +28,14 @@ config("aams_interface_private_config") {
   }
 }
 
-config("aams_interface_public_config") {
+config("accessibility_interface_public_config") {
   include_dirs = [
     "include",
     "include/parcel",
   ]
 }
 
-aams_interface_src = [
+accessibility_interface_src = [
   "src/accessibility_element_operator_callback_proxy.cpp",
   "src/accessibility_element_operator_callback_stub.cpp",
   "src/accessibility_element_operator_proxy.cpp",
@@ -56,7 +56,7 @@ aams_interface_src = [
   "src/accessible_ability_manager_config_observer_stub.cpp",
 ]
 
-aams_data_parcel_src = [
+accessibility_data_parcel_src = [
   "src/parcel/accessibility_ability_info_parcel.cpp",
   "src/parcel/accessibility_caption_parcel.cpp",
   "src/parcel/accessibility_element_info_parcel.cpp",
@@ -65,13 +65,13 @@ aams_data_parcel_src = [
   "src/parcel/accessibility_gesture_inject_path_parcel.cpp",
 ]
 
-ohos_shared_library("aams_interface") {
-  sources = aams_interface_src
-  sources += aams_data_parcel_src
+ohos_shared_library("accessibility_interface") {
+  sources = accessibility_interface_src
+  sources += accessibility_data_parcel_src
 
-  configs = [ ":aams_interface_private_config" ]
+  configs = [ ":accessibility_interface_private_config" ]
 
-  public_configs = [ ":aams_interface_public_config" ]
+  public_configs = [ ":accessibility_interface_public_config" ]
 
   deps = [ "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common" ]
 

frameworks/aafwk/include/accessibility_ui_test_ability_impl.h

@@ -17,7 +17,7 @@
 #define ACCESSIBILITY_UI_TEST_ABILITY_IMPL_H
 
 #include "accessibility_ui_test_ability.h"
-#include "accessible_ability_manager_service_proxy.h"
+#include "i_accessible_ability_manager_service.h"
 
 namespace OHOS {
 namespace Accessibility {
@@ -237,7 +237,7 @@ public:
     virtual void SetCacheMode(const int32_t cacheMode) override;
 
 private:
-    sptr<AccessibleAbilityManagerServiceProxy> serviceProxy_ = nullptr;
+    sptr<IAccessibleAbilityManagerService> serviceProxy_ = nullptr;
 };
 } // namespace Accessibility
 } // namespace OHOS

frameworks/aafwk/src/accessibility_ui_test_ability_impl.cpp

@@ -53,7 +53,7 @@ AccessibilityUITestAbilityImpl::AccessibilityUITestAbilityImpl()
         return;
     }
 
-    serviceProxy_ = iface_cast<AccessibleAbilityManagerServiceProxy>(object);
+    serviceProxy_ = iface_cast<IAccessibleAbilityManagerService>(object);
     if (!serviceProxy_) {
         HILOG_ERROR("Get aams proxy failed");
         return;

frameworks/aafwk/test/BUILD.gn

@@ -107,8 +107,8 @@ ohos_unittest("accessible_ability_test") {
   deps = [
     "//base/global/resource_management/frameworks/resmgr:global_resmgr",
     "//foundation/arkui/napi:ace_napi",
+    "//foundation/barrierfree/accessibility/common/interface:accessibility_interface",
     "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common",
-    "//foundation/barrierfree/accessibility/services/interface:aams_interface",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
   ]

frameworks/asacfwk/test/BUILD.gn

@@ -92,8 +92,8 @@ ohos_unittest("asac_unit_test") {
 
   deps = [
     "//base/global/resource_management/frameworks/resmgr:global_resmgr",
+    "//foundation/barrierfree/accessibility/common/interface:accessibility_interface",
     "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common",
-    "//foundation/barrierfree/accessibility/services/interface:aams_interface",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
     "//third_party/jsoncpp:jsoncpp",

interfaces/innerkits/aafwk/BUILD.gn

@@ -50,7 +50,7 @@ ohos_shared_library("accessibleability") {
 
   deps = [
     "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
-    "//foundation/barrierfree/accessibility/services/interface:aams_interface",
+    "//foundation/barrierfree/accessibility/common/interface:accessibility_interface",
   ]
 
   external_deps = [

interfaces/innerkits/acfwk/BUILD.gn

@@ -45,9 +45,7 @@ ohos_shared_library("accessibilityconfig") {
 
   public_configs = [ ":accessibilityconfig_public_config" ]
 
-  deps = [
-    "//foundation/barrierfree/accessibility/services/interface:aams_interface",
-  ]
+  deps = [ "//foundation/barrierfree/accessibility/common/interface:accessibility_interface" ]
 
   public_deps = [ "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common" ]
 

interfaces/innerkits/asacfwk/BUILD.gn

@@ -45,9 +45,7 @@ ohos_shared_library("accessibilityclient") {
 
   public_configs = [ ":accessibilityclient_public_config" ]
 
-  deps = [
-    "//foundation/barrierfree/accessibility/services/interface:aams_interface",
-  ]
+  deps = [ "//foundation/barrierfree/accessibility/common/interface:accessibility_interface" ]
 
   public_deps = [ "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common" ]
 

interfaces/kits/napi/BUILD.gn

@@ -39,11 +39,11 @@ ohos_shared_library("accessibility") {
     "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
     "${ability_runtime_path}/frameworks/native/appkit:appkit_native",
     "//foundation/arkui/napi:ace_napi",
+    "//foundation/barrierfree/accessibility/common/interface:accessibility_interface",
     "//foundation/barrierfree/accessibility/interfaces/innerkits/aafwk:accessibleability",
     "//foundation/barrierfree/accessibility/interfaces/innerkits/acfwk:accessibilityconfig",
     "//foundation/barrierfree/accessibility/interfaces/innerkits/asacfwk:accessibilityclient",
     "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common",
-    "//foundation/barrierfree/accessibility/services/interface:aams_interface",
   ]
 
   external_deps = [

interfaces/kits/napi/accessibility_config/BUILD.gn

@@ -36,12 +36,12 @@ ohos_shared_library("config_napi") {
     "//foundation/ability/ability_runtime/frameworks/native/ability/native:abilitykit_native",
     "//foundation/ability/ability_runtime/frameworks/native/appkit:appkit_native",
     "//foundation/arkui/napi:ace_napi",
+    "//foundation/barrierfree/accessibility/common/interface:accessibility_interface",
     "//foundation/barrierfree/accessibility/interfaces/innerkits/aafwk:accessibleability",
     "//foundation/barrierfree/accessibility/interfaces/innerkits/acfwk:accessibilityconfig",
     "//foundation/barrierfree/accessibility/interfaces/innerkits/asacfwk:accessibilityclient",
     "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common",
     "//foundation/barrierfree/accessibility/interfaces/kits/napi:accessibility",
-    "//foundation/barrierfree/accessibility/services/interface:aams_interface",
   ]
 
   external_deps = [

services/aams/BUILD.gn

@@ -67,8 +67,8 @@ ohos_shared_library("accessibleabilityms") {
   configs = [ ":aams_service_config" ]
 
   deps = [
+    "//foundation/barrierfree/accessibility/common/interface:accessibility_interface",
     "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common",
-    "//foundation/barrierfree/accessibility/services/interface:aams_interface",
   ]
 
   external_deps = [

services/aams/test/BUILD.gn

@@ -97,9 +97,9 @@ ohos_unittest("accessibility_account_data_test") {
     "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
     "//base/global/resource_management/frameworks/resmgr:global_resmgr",
     "//base/powermgr/power_manager/interfaces/innerkits:powermgr_client",
+    "//foundation/barrierfree/accessibility/common/interface:accessibility_interface",
     "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common",
     "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms",
-    "//foundation/barrierfree/accessibility/services/interface:aams_interface",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
     "//foundation/window/window_manager/utils:libwmutil",
@@ -148,9 +148,9 @@ ohos_unittest("accessible_ability_manager_service_test") {
     "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
     "//base/global/resource_management/frameworks/resmgr:global_resmgr",
     "//base/powermgr/power_manager/interfaces/innerkits:powermgr_client",
+    "//foundation/barrierfree/accessibility/common/interface:accessibility_interface",
     "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common",
     "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms",
-    "//foundation/barrierfree/accessibility/services/interface:aams_interface",
     "//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
     "//foundation/window/window_manager/utils:libwmutil",
     "//third_party/googletest:gmock_main",
@@ -269,9 +269,9 @@ ohos_unittest("accessibility_common_event_registry_test") {
     "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
     "//base/global/resource_management/frameworks/resmgr:global_resmgr",
     "//base/powermgr/power_manager/interfaces/innerkits:powermgr_client",
+    "//foundation/barrierfree/accessibility/common/interface:accessibility_interface",
     "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common",
     "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms",
-    "//foundation/barrierfree/accessibility/services/interface:aams_interface",
     "//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
     "//foundation/window/window_manager/utils:libwmutil",
     "//third_party/googletest:gmock_main",
@@ -340,9 +340,9 @@ ohos_unittest("accessibility_input_interceptor_test") {
     "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
     "//base/global/resource_management/frameworks/resmgr:global_resmgr",
     "//base/powermgr/power_manager/interfaces/innerkits:powermgr_client",
+    "//foundation/barrierfree/accessibility/common/interface:accessibility_interface",
     "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common",
     "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms",
-    "//foundation/barrierfree/accessibility/services/interface:aams_interface",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
     "//foundation/window/window_manager/utils:libwmutil",
@@ -395,9 +395,9 @@ ohos_unittest("accessibility_window_manager_test") {
     "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
     "//base/global/resource_management/frameworks/resmgr:global_resmgr",
     "//base/powermgr/power_manager/interfaces/innerkits:powermgr_client",
+    "//foundation/barrierfree/accessibility/common/interface:accessibility_interface",
     "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common",
     "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms",
-    "//foundation/barrierfree/accessibility/services/interface:aams_interface",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
     "//foundation/window/window_manager/utils:libwmutil",
@@ -459,9 +459,9 @@ ohos_unittest("accessibility_keyevent_filter_test") {
     "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
     "//base/global/resource_management/frameworks/resmgr:global_resmgr",
     "//base/powermgr/power_manager/interfaces/innerkits:powermgr_client",
+    "//foundation/barrierfree/accessibility/common/interface:accessibility_interface",
     "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common",
     "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms",
-    "//foundation/barrierfree/accessibility/services/interface:aams_interface",
     "//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
     "//foundation/window/window_manager/utils:libwmutil",
     "//third_party/googletest:gmock_main",
@@ -538,8 +538,8 @@ ohos_unittest("accessible_ability_connection_test") {
     "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
     "//base/global/resource_management/frameworks/resmgr:global_resmgr",
     "//base/powermgr/power_manager/interfaces/innerkits:powermgr_client",
+    "//foundation/barrierfree/accessibility/common/interface:accessibility_interface",
     "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common",
-    "//foundation/barrierfree/accessibility/services/interface:aams_interface",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
     "//foundation/window/window_manager/utils:libwmutil",
@@ -581,7 +581,7 @@ ohos_unittest("accessibility_display_manager_test") {
     "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
     "//base/global/resource_management/frameworks/resmgr:global_resmgr",
     "//base/powermgr/power_manager/interfaces/innerkits:powermgr_client",
-    "//foundation/barrierfree/accessibility/services/interface:aams_interface",
+    "//foundation/barrierfree/accessibility/common/interface:accessibility_interface",
     "//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
     "//foundation/window/window_manager/utils:libwmutil",
     "//third_party/googletest:gmock_main",
@@ -627,9 +627,9 @@ ohos_unittest("accessibility_touchevent_injector_test") {
     "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native",
     "//base/global/resource_management/frameworks/resmgr:global_resmgr",
     "//base/powermgr/power_manager/interfaces/innerkits:powermgr_client",
+    "//foundation/barrierfree/accessibility/common/interface:accessibility_interface",
     "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common",
     "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms",
-    "//foundation/barrierfree/accessibility/services/interface:aams_interface",
     "//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
     "//foundation/window/window_manager/utils:libwmutil",
     "//third_party/googletest:gmock_main",

services/test/BUILD.gn

@@ -129,8 +129,8 @@ ohos_moduletest("aams_accessibility_touch_guider_test") {
 
   deps = [
     "//base/global/resource_management/frameworks/resmgr:global_resmgr",
+    "//foundation/barrierfree/accessibility/common/interface:accessibility_interface",
     "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common",
-    "//foundation/barrierfree/accessibility/services/interface:aams_interface",
     "//foundation/window/window_manager/utils:libwmutil",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
@@ -210,8 +210,8 @@ ohos_moduletest("aams_accessibility_touchEvent_injector_test") {
 
   deps = [
     "//base/global/resource_management/frameworks/resmgr:global_resmgr",
+    "//foundation/barrierfree/accessibility/common/interface:accessibility_interface",
     "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common",
-    "//foundation/barrierfree/accessibility/services/interface:aams_interface",
     "//foundation/window/window_manager/utils:libwmutil",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
@@ -297,8 +297,8 @@ ohos_moduletest("aams_accessible_ability_channel_test") {
 
   deps = [
     "//base/global/resource_management/frameworks/resmgr:global_resmgr",
+    "//foundation/barrierfree/accessibility/common/interface:accessibility_interface",
     "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common",
-    "//foundation/barrierfree/accessibility/services/interface:aams_interface",
     "//foundation/window/window_manager/utils:libwmutil",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
@@ -382,8 +382,8 @@ ohos_moduletest("aams_server_test") {
 
   deps = [
     "//base/global/resource_management/frameworks/resmgr:global_resmgr",
+    "//foundation/barrierfree/accessibility/common/interface:accessibility_interface",
     "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common",
-    "//foundation/barrierfree/accessibility/services/interface:aams_interface",
     "//foundation/window/window_manager/utils:libwmutil",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
@@ -461,8 +461,8 @@ ohos_moduletest("aams_accessibility_keyevent_filter_test") {
 
   deps = [
     "//base/global/resource_management/frameworks/resmgr:global_resmgr",
+    "//foundation/barrierfree/accessibility/common/interface:accessibility_interface",
     "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common",
-    "//foundation/barrierfree/accessibility/services/interface:aams_interface",
     "//foundation/window/window_manager/utils:libwmutil",
     "//third_party/googletest:gmock_main",
     "//third_party/googletest:gtest_main",
@@ -546,8 +546,8 @@ ohos_moduletest("aams_common_event_registry_test") {
 
   deps = [
     "//base/global/resource_management/frameworks/resmgr:global_resmgr",
+    "//foundation/barrierfree/accessibility/common/interface:accessibility_interface",
     "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common",
-    "//foundation/barrierfree/accessibility/services/interface:aams_interface",
     "//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
     "//foundation/window/window_manager/utils:libwmutil",
     "//third_party/googletest:gmock_main",