From 3e8492720d24b5ea02656a552248f902f478698f Mon Sep 17 00:00:00 2001 From: SoftSquirrel Date: Thu, 17 Feb 2022 11:30:01 +0800 Subject: [PATCH 1/2] Description: add accessible, uri Feature or Bugfix: Feature Binary Source: No Signed-off-by: SoftSquirrel --- modulecheck/app.json | 70 ++++++++++++++++++++++++++++++++++++----- modulecheck/module.json | 33 ++++++++++++++++--- 2 files changed, 90 insertions(+), 13 deletions(-) diff --git a/modulecheck/app.json b/modulecheck/app.json index 2151a18f..7603470a 100644 --- a/modulecheck/app.json +++ b/modulecheck/app.json @@ -44,6 +44,7 @@ "removable", "singleton", "userDataClearable", + "accessible", "phone", "tablet", "tv", @@ -167,6 +168,11 @@ "type": "boolean", "default": true }, + "accessible": { + "description": "Identifies whether the app's installation directory is accessible", + "type": "boolean", + "default": false + }, "phone": { "description": "The configuration in the default tag is applicable to all devices. If the configuration is different for other device types, you need to configure the configuration under the configuration tag of the device type.", "type": "object", @@ -177,7 +183,8 @@ "keepAlive", "removable", "singleton", - "userDataClearable" + "userDataClearable", + "accessible" ] }, "properties": { @@ -211,6 +218,11 @@ "description": "Describes whether to allow the application to clear user data. This attribute takes effect only when the system application or privilege application is used.", "type": "boolean", "default": true + }, + "accessible": { + "description": "Identifies whether the app's installation directory is accessible", + "type": "boolean", + "default": false } } }, @@ -224,7 +236,8 @@ "keepAlive", "removable", "singleton", - "userDataClearable" + "userDataClearable", + "accessible" ] }, "properties": { @@ -258,6 +271,11 @@ "description": "Describes whether to allow the application to clear user data. This attribute takes effect only when the system application or privilege application is used.", "type": "boolean", "default": true + }, + "accessible": { + "description": "Identifies whether the app's installation directory is accessible", + "type": "boolean", + "default": false } } }, @@ -271,7 +289,8 @@ "keepAlive", "removable", "singleton", - "userDataClearable" + "userDataClearable", + "accessible" ] }, "properties": { @@ -305,6 +324,11 @@ "description": "Describes whether to allow the application to clear user data. This attribute takes effect only when the system application or privilege application is used.", "type": "boolean", "default": true + }, + "accessible": { + "description": "Identifies whether the app's installation directory is accessible", + "type": "boolean", + "default": false } } }, @@ -318,7 +342,8 @@ "keepAlive", "removable", "singleton", - "userDataClearable" + "userDataClearable", + "accessible" ] }, "properties": { @@ -352,6 +377,11 @@ "description": "Describes whether to allow the application to clear user data. This attribute takes effect only when the system application or privilege application is used.", "type": "boolean", "default": true + }, + "accessible": { + "description": "Identifies whether the app's installation directory is accessible", + "type": "boolean", + "default": false } } }, @@ -365,7 +395,8 @@ "keepAlive", "removable", "singleton", - "userDataClearable" + "userDataClearable", + "accessible" ] }, "properties": { @@ -399,6 +430,11 @@ "description": "Describes whether to allow the application to clear user data. This attribute takes effect only when the system application or privilege application is used.", "type": "boolean", "default": true + }, + "accessible": { + "description": "Identifies whether the app's installation directory is accessible", + "type": "boolean", + "default": false } } }, @@ -412,7 +448,8 @@ "keepAlive", "removable", "singleton", - "userDataClearable" + "userDataClearable", + "accessible" ] }, "properties": { @@ -446,6 +483,11 @@ "description": "Describes whether to allow the application to clear user data. This attribute takes effect only when the system application or privilege application is used.", "type": "boolean", "default": true + }, + "accessible": { + "description": "Identifies whether the app's installation directory is accessible", + "type": "boolean", + "default": false } } }, @@ -459,7 +501,8 @@ "keepAlive", "removable", "singleton", - "userDataClearable" + "userDataClearable", + "accessible" ] }, "properties": { @@ -493,6 +536,11 @@ "description": "Describes whether to allow the application to clear user data. This attribute takes effect only when the system application or privilege application is used.", "type": "boolean", "default": true + }, + "accessible": { + "description": "Identifies whether the app's installation directory is accessible", + "type": "boolean", + "default": false } } }, @@ -506,7 +554,8 @@ "keepAlive", "removable", "singleton", - "userDataClearable" + "userDataClearable", + "accessible" ] }, "properties": { @@ -540,6 +589,11 @@ "description": "Describes whether to allow the application to clear user data. This attribute takes effect only when the system application or privilege application is used.", "type": "boolean", "default": true + }, + "accessible": { + "description": "Identifies whether the app's installation directory is accessible", + "type": "boolean", + "default": false } } } diff --git a/modulecheck/module.json b/modulecheck/module.json index 3c1b6d28..e4247466 100644 --- a/modulecheck/module.json +++ b/modulecheck/module.json @@ -402,11 +402,28 @@ "type": "array", "items": { "type": "object", - "required": [ - "name", - "srcEntrance", - "type" - ], + "if" : { + "properties": { + "type": { + "const": "dataShare" + } + } + }, + "then": { + "required": [ + "name", + "srcEntrance", + "type", + "uri" + ] + }, + "else" : { + "required": [ + "name", + "srcEntrance", + "type" + ] + }, "propertyNames": { "enum": [ "name", @@ -419,6 +436,7 @@ "readPermission", "writePermission", "visible", + "uri", "skills", "metadata" ] @@ -489,6 +507,11 @@ "type": "boolean", "default": false }, + "uri": { + "description": "Identifies the provided data uri", + "type": "string", + "maxLength": 255 + }, "skills": { "description": "Indicates the types of the intent that can be accepted by the extension.", "type": "array", -- Gitee From 72c94fd60a40df35d4d38221567fef56cdb2669c Mon Sep 17 00:00:00 2001 From: SoftSquirrel Date: Thu, 17 Feb 2022 15:38:07 +0800 Subject: [PATCH 2/2] Description: add uri Feature or Bugfix: Feature Binary Source: No Signed-off-by: SoftSquirrel --- modulecheck/app.json | 70 +++++--------------------------------------- 1 file changed, 8 insertions(+), 62 deletions(-) diff --git a/modulecheck/app.json b/modulecheck/app.json index 7603470a..2151a18f 100644 --- a/modulecheck/app.json +++ b/modulecheck/app.json @@ -44,7 +44,6 @@ "removable", "singleton", "userDataClearable", - "accessible", "phone", "tablet", "tv", @@ -168,11 +167,6 @@ "type": "boolean", "default": true }, - "accessible": { - "description": "Identifies whether the app's installation directory is accessible", - "type": "boolean", - "default": false - }, "phone": { "description": "The configuration in the default tag is applicable to all devices. If the configuration is different for other device types, you need to configure the configuration under the configuration tag of the device type.", "type": "object", @@ -183,8 +177,7 @@ "keepAlive", "removable", "singleton", - "userDataClearable", - "accessible" + "userDataClearable" ] }, "properties": { @@ -218,11 +211,6 @@ "description": "Describes whether to allow the application to clear user data. This attribute takes effect only when the system application or privilege application is used.", "type": "boolean", "default": true - }, - "accessible": { - "description": "Identifies whether the app's installation directory is accessible", - "type": "boolean", - "default": false } } }, @@ -236,8 +224,7 @@ "keepAlive", "removable", "singleton", - "userDataClearable", - "accessible" + "userDataClearable" ] }, "properties": { @@ -271,11 +258,6 @@ "description": "Describes whether to allow the application to clear user data. This attribute takes effect only when the system application or privilege application is used.", "type": "boolean", "default": true - }, - "accessible": { - "description": "Identifies whether the app's installation directory is accessible", - "type": "boolean", - "default": false } } }, @@ -289,8 +271,7 @@ "keepAlive", "removable", "singleton", - "userDataClearable", - "accessible" + "userDataClearable" ] }, "properties": { @@ -324,11 +305,6 @@ "description": "Describes whether to allow the application to clear user data. This attribute takes effect only when the system application or privilege application is used.", "type": "boolean", "default": true - }, - "accessible": { - "description": "Identifies whether the app's installation directory is accessible", - "type": "boolean", - "default": false } } }, @@ -342,8 +318,7 @@ "keepAlive", "removable", "singleton", - "userDataClearable", - "accessible" + "userDataClearable" ] }, "properties": { @@ -377,11 +352,6 @@ "description": "Describes whether to allow the application to clear user data. This attribute takes effect only when the system application or privilege application is used.", "type": "boolean", "default": true - }, - "accessible": { - "description": "Identifies whether the app's installation directory is accessible", - "type": "boolean", - "default": false } } }, @@ -395,8 +365,7 @@ "keepAlive", "removable", "singleton", - "userDataClearable", - "accessible" + "userDataClearable" ] }, "properties": { @@ -430,11 +399,6 @@ "description": "Describes whether to allow the application to clear user data. This attribute takes effect only when the system application or privilege application is used.", "type": "boolean", "default": true - }, - "accessible": { - "description": "Identifies whether the app's installation directory is accessible", - "type": "boolean", - "default": false } } }, @@ -448,8 +412,7 @@ "keepAlive", "removable", "singleton", - "userDataClearable", - "accessible" + "userDataClearable" ] }, "properties": { @@ -483,11 +446,6 @@ "description": "Describes whether to allow the application to clear user data. This attribute takes effect only when the system application or privilege application is used.", "type": "boolean", "default": true - }, - "accessible": { - "description": "Identifies whether the app's installation directory is accessible", - "type": "boolean", - "default": false } } }, @@ -501,8 +459,7 @@ "keepAlive", "removable", "singleton", - "userDataClearable", - "accessible" + "userDataClearable" ] }, "properties": { @@ -536,11 +493,6 @@ "description": "Describes whether to allow the application to clear user data. This attribute takes effect only when the system application or privilege application is used.", "type": "boolean", "default": true - }, - "accessible": { - "description": "Identifies whether the app's installation directory is accessible", - "type": "boolean", - "default": false } } }, @@ -554,8 +506,7 @@ "keepAlive", "removable", "singleton", - "userDataClearable", - "accessible" + "userDataClearable" ] }, "properties": { @@ -589,11 +540,6 @@ "description": "Describes whether to allow the application to clear user data. This attribute takes effect only when the system application or privilege application is used.", "type": "boolean", "default": true - }, - "accessible": { - "description": "Identifies whether the app's installation directory is accessible", - "type": "boolean", - "default": false } } } -- Gitee