From b8fc66419e8d3089a4a22b7f73bf26aa03247ec7 Mon Sep 17 00:00:00 2001
From: houhaoyu <houhaoyu@huawei.com>
Date: Wed, 23 Feb 2022 21:21:35 +0800
Subject: [PATCH] fixed 1bc5107 from
 https://gitee.com/houhaoyu/interface_sdk-js/pulls/775 houhaoyu@huawei.com

change syscapSchema

Signed-off-by: houhaoyu <houhaoyu@huawei.com>
Change-Id: I167d8a9307b56ff13bee8d790e1c9f1db7899be4
---
 api/device-define/PC.json           |  5 +++++
 api/device-define/car.json          |  5 +++++
 api/device-define/liteWearable.json |  5 +++++
 api/device-define/router.json       |  5 +++++
 api/device-define/smartVision.json  |  5 +++++
 api/device-define/tablet.json       |  5 +++++
 api/device-define/tv.json           |  5 +++++
 api/device-define/wearable.json     |  5 +++++
 api/syscapCheck/sysCapSchema.json   | 27 +++++++++++++++------------
 9 files changed, 55 insertions(+), 12 deletions(-)
 create mode 100644 api/device-define/PC.json
 create mode 100644 api/device-define/car.json
 create mode 100644 api/device-define/liteWearable.json
 create mode 100644 api/device-define/router.json
 create mode 100644 api/device-define/smartVision.json
 create mode 100644 api/device-define/tablet.json
 create mode 100644 api/device-define/tv.json
 create mode 100644 api/device-define/wearable.json

diff --git a/api/device-define/PC.json b/api/device-define/PC.json
new file mode 100644
index 0000000000..053868fe2e
--- /dev/null
+++ b/api/device-define/PC.json
@@ -0,0 +1,5 @@
+{
+  "SysCaps": [
+    "SystemCapability.ArkUI.ArkUI.Full"
+  ]
+}
\ No newline at end of file
diff --git a/api/device-define/car.json b/api/device-define/car.json
new file mode 100644
index 0000000000..053868fe2e
--- /dev/null
+++ b/api/device-define/car.json
@@ -0,0 +1,5 @@
+{
+  "SysCaps": [
+    "SystemCapability.ArkUI.ArkUI.Full"
+  ]
+}
\ No newline at end of file
diff --git a/api/device-define/liteWearable.json b/api/device-define/liteWearable.json
new file mode 100644
index 0000000000..17bc0061a2
--- /dev/null
+++ b/api/device-define/liteWearable.json
@@ -0,0 +1,5 @@
+{
+  "SysCaps": [
+    "SystemCapability.ArkUI.ArkUI.Lite"
+  ]
+}
\ No newline at end of file
diff --git a/api/device-define/router.json b/api/device-define/router.json
new file mode 100644
index 0000000000..1aaf14cd60
--- /dev/null
+++ b/api/device-define/router.json
@@ -0,0 +1,5 @@
+{
+  "SysCaps": [
+    "SystemCapability.Communication.SoftBus.Core"
+  ]
+}
\ No newline at end of file
diff --git a/api/device-define/smartVision.json b/api/device-define/smartVision.json
new file mode 100644
index 0000000000..17bc0061a2
--- /dev/null
+++ b/api/device-define/smartVision.json
@@ -0,0 +1,5 @@
+{
+  "SysCaps": [
+    "SystemCapability.ArkUI.ArkUI.Lite"
+  ]
+}
\ No newline at end of file
diff --git a/api/device-define/tablet.json b/api/device-define/tablet.json
new file mode 100644
index 0000000000..053868fe2e
--- /dev/null
+++ b/api/device-define/tablet.json
@@ -0,0 +1,5 @@
+{
+  "SysCaps": [
+    "SystemCapability.ArkUI.ArkUI.Full"
+  ]
+}
\ No newline at end of file
diff --git a/api/device-define/tv.json b/api/device-define/tv.json
new file mode 100644
index 0000000000..053868fe2e
--- /dev/null
+++ b/api/device-define/tv.json
@@ -0,0 +1,5 @@
+{
+  "SysCaps": [
+    "SystemCapability.ArkUI.ArkUI.Full"
+  ]
+}
\ No newline at end of file
diff --git a/api/device-define/wearable.json b/api/device-define/wearable.json
new file mode 100644
index 0000000000..053868fe2e
--- /dev/null
+++ b/api/device-define/wearable.json
@@ -0,0 +1,5 @@
+{
+  "SysCaps": [
+    "SystemCapability.ArkUI.ArkUI.Full"
+  ]
+}
\ No newline at end of file
diff --git a/api/syscapCheck/sysCapSchema.json b/api/syscapCheck/sysCapSchema.json
index 5650316dbf..f0da24203d 100644
--- a/api/syscapCheck/sysCapSchema.json
+++ b/api/syscapCheck/sysCapSchema.json
@@ -3,25 +3,28 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
   "additionalProperties": true,
+  "required": [
+    "devices"
+  ],
   "propertyNames": {
     "enum": [
-      "base",
+      "devices",
       "development",
       "production"
     ]
   },
   "properties": {
-    "base": {
+    "devices": {
       "description": "Basic system capability",
       "type": "object",
       "propertyNames": {
         "enum": [
-          "deviceType",
-          "NDeviceSysCaps"
+          "general",
+          "custom"
         ]
       },
       "properties": {
-        "deviceType": {
+        "general": {
           "description": "core equipment",
           "type":"array",
           "items": {
@@ -31,19 +34,19 @@
               "tv",
               "tablet",
               "wearable",
-              "litewearable",
-              "car"
+              "liteWearable",
+              "car",
+              "smartVision",
+              "PC",
+              "router"
             ]
           }
         },
-        "NDeviceSysCaps": {
+        "custom": {
           "description": "N equipment",
           "type":"array",
           "items": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
+            "type": "object"
           }
         }
       }
-- 
Gitee