From 6fa4d6fd3138bd56d91cec5c040a88b62f97abb8 Mon Sep 17 00:00:00 2001 From: "taiyi.pei" Date: Wed, 10 Aug 2022 15:30:19 +0800 Subject: [PATCH 1/4] add syscap and format to unix Signed-off-by: taiyi.pei --- bundle.json | 88 ++++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/bundle.json b/bundle.json index 1f66266..f05efa3 100644 --- a/bundle.json +++ b/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" ] + } + } +} From 7d7cc19fd699481dcdf7996f32a9f2a05946a3e6 Mon Sep 17 00:00:00 2001 From: "taiyi.pei" Date: Wed, 10 Aug 2022 15:39:10 +0800 Subject: [PATCH 2/4] add in syscap int define Signed-off-by: taiyi.pei --- include/syscap_define.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/syscap_define.h b/include/syscap_define.h index d74ef83..e81c20c 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -193,6 +193,7 @@ typedef enum SystemCapabilityNum { LOCATION_LOCATION_GEOFENCE, LOCATION_LOCATION_GEOCODER, LOCATION_LOCATION_LITE, + DEVELOPTOOLS_SYSCAP, // Add here SYSCAP_NUM_MAX = 960 } SyscapNum; @@ -359,6 +360,7 @@ 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}, }; #endif // _SYSCAP_DEFINE_H From 805269108db5f75f465c74a558335b87b737356e Mon Sep 17 00:00:00 2001 From: jiangminyang Date: Thu, 11 Aug 2022 16:48:17 +0800 Subject: [PATCH 3/4] fixed sdk syscap for camera. Signed-off-by: jiangminyang --- include/syscap_define.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/syscap_define.h b/include/syscap_define.h index 0592b4f..efc1cd3 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -200,6 +200,7 @@ typedef enum SystemCapabilityNum { MULTIMEDIA_AUDIO_DEVICE, MULTIMEDIA_AUDIO_VOLUME, MULTIMEDIA_AUDIO_COMMUNICATION, + MULTIMEDIA_CAMERA_CORE, // Add here SYSCAP_NUM_MAX = 960 } SyscapNum; @@ -373,6 +374,7 @@ const static SyscapWithNum g_arraySyscap[] = { {"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}, }; #endif // _SYSCAP_DEFINE_H From 7a04ca4e8a6b91dd6191cca883909d7d98c435d7 Mon Sep 17 00:00:00 2001 From: yichengzhao Date: Thu, 11 Aug 2022 16:43:18 +0800 Subject: [PATCH 4/4] add accessibility syscap Signed-off-by: yichengzhao Change-Id: Ie5bdb257fb3872d9e73db1f7863c4a2944fa341a --- include/syscap_define.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/syscap_define.h b/include/syscap_define.h index efc1cd3..485cbbb 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -201,6 +201,8 @@ typedef enum SystemCapabilityNum { MULTIMEDIA_AUDIO_VOLUME, MULTIMEDIA_AUDIO_COMMUNICATION, MULTIMEDIA_CAMERA_CORE, + BARRIERFREE_ACCESSIBILITY_HEARING, + BARRIERFREE_ACCESSIBILITY_VISION, // Add here SYSCAP_NUM_MAX = 960 } SyscapNum; @@ -214,6 +216,8 @@ 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},