Merge branch 'master' of https://gitee.com/openharmony/developtools_syscap_codec into pr_111

Change-Id: I6ad0739ef4790cf54198667fc05e0148e306b525

bundle.json

@@ -1,44 +1,44 @@
-{
-  "name": "@ohos/syscap_codec",
-  "description": "SystemCapability encode/decode.",
-  "version": "3.1",
-  "license": "Apache License 2.0",
-  "pubiishAs": "code-segment",
-  "segment": {
-    "destPath": "developtools/syscap_codec"
-  },
-  "dirs": {},
-  "scripts": {},
-  "component": {
-    "name": "syscap_codec",
-    "subsystem": "developtools",
-    "syscap": [],
-    "feature": [],
-    "adapted_system_type": [ "small", "standard" ],
-    "deps": {
-      "components": [
-        "napi",
-        "hiviewdfx_hilog_native"
-      ],
-      "third_party": [
-        "bounds_checking_function",
-        "cjson"
-      ]
-    },
-    "build": {
-      "sub_component": [
-        "//developtools/syscap_codec:syscap_codec"
-      ],
-      "inner_kits": [
-        {
-          "header": {
-            "header_base": "//developtools/syscap_codec/interfaces/inner_api",
-            "header_files": [ "syscap_interface.h" ]
-          },
-          "name": "//developtools/syscap_codec:syscap_interface_shared"
-        }
-      ],
-      "test": [ "//developtools/syscap_codec/test/unittest/common:unittest" ]
-    }
-  }
-}
+{
+  "name": "@ohos/syscap_codec",
+  "description": "System capability encode and decode.",
+  "version": "3.2",
+  "license": "Apache License 2.0",
+  "pubiishAs": "code-segment",
+  "segment": {
+    "destPath": "developtools/syscap_codec"
+  },
+  "dirs": {},
+  "scripts": {},
+  "component": {
+    "name": "syscap_codec",
+    "subsystem": "developtools",
+    "syscap": [ "SystemCapability.Developtools.Syscap" ],
+    "feature": [],
+    "adapted_system_type": [ "small", "standard" ],
+    "deps": {
+      "components": [
+        "napi",
+        "hiviewdfx_hilog_native"
+      ],
+      "third_party": [
+        "bounds_checking_function",
+        "cjson"
+      ]
+    },
+    "build": {
+      "sub_component": [
+        "//developtools/syscap_codec:syscap_codec"
+      ],
+      "inner_kits": [
+        {
+          "header": {
+            "header_base": "//developtools/syscap_codec/interfaces/inner_api",
+            "header_files": [ "syscap_interface.h" ]
+          },
+          "name": "//developtools/syscap_codec:syscap_interface_shared"
+        }
+      ],
+      "test": [ "//developtools/syscap_codec/test/unittest/common:unittest" ]
+    }
+  }
+}

include/syscap_define.h

@@ -48,9 +48,9 @@ typedef enum SystemCapabilityNum {
     COMMUNICATION_NETSTACK,
     COMMUNICATION_NFC_CORE,
     COMMUNICATION_SOFTBUS_CORE,
-    COMMUNICATION_WIFI_AP,
+    COMMUNICATION_WIFI_AP, // abandoned
     COMMUNICATION_WIFI_CORE,
-    COMMUNICATION_WIFI_HOTSPOTEXT,
+    COMMUNICATION_WIFI_HOTSPOTEXT, // abandoned
     COMMUNICATION_WIFI_P2P,
     COMMUNICATION_WIFI_STA,
     CUSTOMIZATION_CONFIGPOLICY,
@@ -193,10 +193,32 @@ typedef enum SystemCapabilityNum {
     LOCATION_LOCATION_GEOFENCE,
     LOCATION_LOCATION_GEOCODER,
     LOCATION_LOCATION_LITE,
+    DEVELOPTOOLS_SYSCAP,
+    COMMUNICATION_BLUETOOTH_LITE,
+    MULTIMEDIA_AUDIO_CORE,
+    MULTIMEDIA_AUDIO_RENDERER,
+    MULTIMEDIA_AUDIO_CAPTURER,
+    MULTIMEDIA_AUDIO_DEVICE,
+    MULTIMEDIA_AUDIO_VOLUME,
+    MULTIMEDIA_AUDIO_COMMUNICATION,
+    MULTIMEDIA_CAMERA_CORE,
+    BARRIERFREE_ACCESSIBILITY_HEARING,
+    BARRIERFREE_ACCESSIBILITY_VISION,
+    ABILITY_ABILITYBASE,
+    ABILITY_ABILITYRUNTIME_CORE,
+    ABILITY_ABILITYRUNTIME_FAMODEL,
+    ABILITY_ABILITYRUNTIME_ABILITYCORE,
+    ABILITY_ABILITYRUNTIME_MISSION,
+    ABILITY_ABILITYTOOLS_ABILITYASSISTANT,
+    ABILITY_DISTRIBUTEDABILITYMANAGER,
+    ABILITY_FORM,
+    COMMUNICATION_WIFI_AP_CORE,
+    COMMUNICATION_WIFI_AP_EXTENSION,
     // Add here
     SYSCAP_NUM_MAX = 960
 } SyscapNum;
 
+
 /* sort by enum */
 const static SyscapWithNum g_arraySyscap[] = {
     {"SystemCapability.Account.AppAccount", ACCOUNT_APPACCOUNT},
@@ -206,20 +228,23 @@ const static SyscapWithNum g_arraySyscap[] = {
     {"SystemCapability.Ai.AiEngine", AI_AIENGINE},
     {"SystemCapability.Applications.ContactsData", APPLICATIONS_CONTACTSDATA},
     {"SystemCapability.Barrierfree.Accessibility.Core", BARRIERFREE_ACCESSIBILITY_CORE},
+    {"SystemCapability.BarrierFree.Accessibility.Hearing", BARRIERFREE_ACCESSIBILITY_HEARING},
+    {"SystemCapability.BarrierFree.Accessibility.Vision", BARRIERFREE_ACCESSIBILITY_VISION},
     {"SystemCapability.BundleManager.BundleFramework", BUNDLEMANAGER_BUNDLEFRAMEWORK},
     {"SystemCapability.BundleManager.BundleTool", BUNDLEMANAGER_BUNDLETOOL},
     {"SystemCapability.BundleManager.DistributedBundleFramework", BUNDLEMANAGER_DISTRIBUTEDBUNDLEFRAMEWORK},
     {"SystemCapability.BundleManager.Zlib", BUNDLEMANAGER_ZLIB},
     {"SystemCapability.Communication.Bluetooth.Core", COMMUNICATION_BLUETOOTH_CORE},
+    {"SystemCapability.Communication.Bluetooth.Lite", COMMUNICATION_BLUETOOTH_LITE},
     {"SystemCapability.Communication.ConnectedTag", COMMUNICATION_CONNECTEDTAG},
     {"SystemCapability.Communication.NetManager.Core", COMMUNICATION_NETMANAGER_CORE},
     {"SystemCapability.Communication.NetManager.Extension", COMMUNICATION_NETMANAGER_EXTENSION},
     {"SystemCapability.Communication.NetStack", COMMUNICATION_NETSTACK},
     {"SystemCapability.Communication.NFC.Core", COMMUNICATION_NFC_CORE},
     {"SystemCapability.Communication.SoftBus.Core", COMMUNICATION_SOFTBUS_CORE},
-    {"SystemCapability.Communication.WiFi.AP", COMMUNICATION_WIFI_AP},
+    {"SystemCapability.Communication.WiFi.AP.Core", COMMUNICATION_WIFI_AP_CORE},
     {"SystemCapability.Communication.WiFi.Core", COMMUNICATION_WIFI_CORE},
-    {"SystemCapability.Communication.WiFi.HotspotExt", COMMUNICATION_WIFI_HOTSPOTEXT},
+    {"SystemCapability.Communication.WiFi.AP.Extension", COMMUNICATION_WIFI_AP_EXTENSION},
     {"SystemCapability.Communication.WiFi.P2P", COMMUNICATION_WIFI_P2P},
     {"SystemCapability.Communication.WiFi.STA", COMMUNICATION_WIFI_STA},
     {"SystemCapability.Customization.ConfigPolicy", CUSTOMIZATION_CONFIGPOLICY},
@@ -359,6 +384,22 @@ const static SyscapWithNum g_arraySyscap[] = {
     {"SystemCapability.UserIAM.UserAuth.PinAuth", USERIAM_USERAUTH_PINAUTH},
     {"SystemCapability.UserIAM.UserIdm", USERIAM_USERIDM},
     {"SystemCapability.Security.CertificateManager", SECURITY_CERTIFICATE_MANAGER},
+    {"SystemCapability.Developtools.Syscap", DEVELOPTOOLS_SYSCAP},
+    {"SystemCapability.Multimedia.Audio.Core", MULTIMEDIA_AUDIO_CORE},
+    {"SystemCapability.Multimedia.Audio.Renderer", MULTIMEDIA_AUDIO_RENDERER},
+    {"SystemCapability.Multimedia.Audio.Capturer", MULTIMEDIA_AUDIO_CAPTURER},
+    {"SystemCapability.Multimedia.Audio.Device", MULTIMEDIA_AUDIO_DEVICE},
+    {"SystemCapability.Multimedia.Audio.Volume", MULTIMEDIA_AUDIO_VOLUME},
+    {"SystemCapability.Multimedia.Audio.Communication", MULTIMEDIA_AUDIO_COMMUNICATION},
+    {"SystemCapability.Multimedia.Camera.Core", MULTIMEDIA_CAMERA_CORE},
+    {"SystemCapability.Ability.AbilityBase", ABILITY_ABILITYBASE},
+    {"SystemCapability.Ability.AbilityRuntime.Core", ABILITY_ABILITYRUNTIME_CORE},
+    {"SystemCapability.Ability.AbilityRuntime.FAModel", ABILITY_ABILITYRUNTIME_FAMODEL},
+    {"SystemCapability.Ability.AbilityRuntime.AbilityCore", ABILITY_ABILITYRUNTIME_ABILITYCORE},
+    {"SystemCapability.Ability.AbilityRuntime.Mission", ABILITY_ABILITYRUNTIME_MISSION},
+    {"SystemCapability.Ability.AbilityTools.AbilityAssistant", ABILITY_ABILITYTOOLS_ABILITYASSISTANT},
+    {"SystemCapability.Ability.DistributedAbilityManager", ABILITY_DISTRIBUTEDABILITYMANAGER},
+    {"SystemCapability.Ability.Form", ABILITY_FORM},
 };
 
 #endif  // _SYSCAP_DEFINE_H