From 88760366f2075672e7ac14b45f0d2a5ddd7abaf8 Mon Sep 17 00:00:00 2001 From: longwei Date: Thu, 14 Apr 2022 20:37:20 +0800 Subject: [PATCH] fix deviceType in api9 Signed-off-by: longwei --- configcheck/configSchema_rich.json | 167 ++++++++++++++++++++++++++++- modulecheck/app.json | 68 ++---------- modulecheck/module.json | 1 + 3 files changed, 172 insertions(+), 64 deletions(-) diff --git a/configcheck/configSchema_rich.json b/configcheck/configSchema_rich.json index e273c71e..b941b32f 100755 --- a/configcheck/configSchema_rich.json +++ b/configcheck/configSchema_rich.json @@ -142,9 +142,13 @@ "items": { "type": "string", "enum": [ + "default", + "car", "phone", + "router", "tablet", - "tv" + "tv", + "wearable" ] } }, @@ -173,11 +177,11 @@ "enum": [ "car", "default", - "liteWearable", "phone", "tablet", "tv", - "wearable" + "wearable", + "router" ] }, "properties": { @@ -1122,6 +1126,163 @@ "type": "boolean" } } + }, + "router": { + "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", + "propertyNames": { + "enum": [ + "keepAlive", + "jointUserId", + "process", + "ark", + "directLaunch", + "network", + "supportBackup", + "compressNativeLibs", + "allowComponentsProxy" + ] + }, + "properties": { + "keepAlive": { + "description": "Specifies whether the application will keep alive.If this attribute is set to true, the application will start during the OS startup. If the application process exits, the OS will restart it. This attribute applies only to system applications.This attribute is not supported by basic watches.This label can be left blank by default.", + "type": "boolean" + }, + "jointUserId": { + "description": "Indicates the user ID shared by applications.Generally, applications run in different processes, and resources used by the applications are isolated. However, in some cases, you may develop multiple applications that need to share resources with each other. This resource sharing is implemented based on the same jointUserId value on the premise that the applications have the same signature.This attribute is not supported by devices running the OHOS.", + "type": "string" + }, + "process": { + "description": "Indicates the name of the process running the application or ability.If a process is configured in the deviceConfig tag, all abilities of the application run in this process. You can also set the process attribute for a specific ability, so that the ability can run in this process. If this attribute is set to the same process name as other applications, all these applications can run in the same process on the premise that they have the same jointUserId and the same signature.This attribute is not supported by devices running the OHOS.", + "type": "string", + "maxLength": 31 + }, + "ark": { + "description": "This tag identifies maple configuration information.", + "type": "object", + "propertyNames": { + "enum": [ + "reqVersion", + "flag" + ] + }, + "properties": { + "reqVersion": { + "description": "Maple version number that supports the application.", + "type": "object", + "propertyNames": { + "enum": [ + "compatible", + "target" + ] + }, + "properties": { + "compatible": { + "description": "Indicates the minimum maple version that supports the application. This label is an integer.", + "type": "integer", + "minimum": 0 + }, + "target": { + "description": "Specifies the target maple version of the application. This label is an integer.", + "type": "integer", + "minimum": 0 + } + } + }, + "flag": { + "description": "Specifies the type of the maple application.", + "type": "string", + "enum": [ + "m", + "mo", + "z" + ] + } + } + }, + "directLaunch": { + "description": "Specifies whether the application can be started when the device is locked. Set this attribute to true if you want to start the application without unlocking the device.This attribute is not supported by devices running the OHOS.", + "type": "boolean" + }, + "network": { + "description": "Indicates the network security configuration. You can customize the network security settings of the application in a security statement configuration file without modifying the application code.", + "type": "object", + "propertyNames": { + "enum": [ + "cleartextTraffic", + "securityConfig" + ] + }, + "properties": { + "cleartextTraffic": { + "description": "Specifies whether an application can use plaintext network transmission. The value is of the Boolean type. The value true indicates that plaintext network transmission is enabled.", + "type": "boolean" + }, + "securityConfig": { + "description": "Indicates the network security configuration of the application.", + "type": "object", + "propertyNames": { + "enum": [ + "domainSettings" + ] + }, + "properties": { + "domainSettings": { + "description": "Indicates the security settings of the custom network domain. This attribute allows nested domains. To be more specific, the domainSettings object of a large domain can be nested with the domainSettings objects of small network domains.", + "type": "object", + "propertyNames": { + "enum": [ + "cleartextPermitted", + "domains" + ] + }, + "properties": { + "cleartextPermitted": { + "description": "Specifies whether plaintext traffic can be transmitted in the custom network domain. If both cleartextTraffic and securityConfig are declared, whether plaintext traffic can be transmitted in the custom network domain is determined by the cleartextPermitted attribute.", + "type": "boolean" + }, + "domains": { + "description": "Indicates the domain name configuration. This attribute consists of the subDomains and name sub-attributes.", + "type": "array", + "items": { + "type": "object", + "propertyNames": { + "enum": [ + "subdomains", + "name" + ] + }, + "properties": { + "subdomains": { + "description": "Subdomain name", + "type": "boolean" + }, + "name": { + "description": "Domain name", + "type": "string" + } + } + } + } + } + } + } + } + } + }, + "supportBackup": { + "description": "Specifies whether the application supports backup and restoration. If this attribute is set to false, backup or restoration will never be performed for the application.This attribute is not supported by devices running the OHOS.", + "type": "boolean" + }, + "compressNativeLibs": { + "description": "Specifies whether the libs libraries of the .hap file are compressed for storage. If this attribute is set to false, the libs libraries are stored without being compressed and will be directly loaded during the installation of the .hap file.This attribute is not supported by devices running the OHOS.", + "type": "boolean" + }, + "allowComponentsProxy": { + "description": "Indicates whether the application supports the ability proxy.If this property is set to true, the ability component can be hooked.", + "type": "boolean" + } + } } } }, diff --git a/modulecheck/app.json b/modulecheck/app.json index 4cc9534e..6d69fbf9 100644 --- a/modulecheck/app.json +++ b/modulecheck/app.json @@ -44,13 +44,12 @@ "userDataClearable", "accessible", "targetBundleList", + "default", "phone", "tablet", "tv", "wearable", - "liteWearable", "car", - "smartVision", "router" ] }, @@ -180,7 +179,7 @@ "type": "string" } }, - "phone": { + "default": { "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", "propertyNames": { @@ -233,7 +232,7 @@ } } }, - "tablet": { + "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", "propertyNames": { @@ -247,7 +246,7 @@ "accessible" ] }, - "properties": { + "properties": { "minAPIVersion": { "description": "Indicates the minimum API version required for running an application. This label is an integer and can be defaulted.", "type": "integer", @@ -286,7 +285,7 @@ } } }, - "tv": { + "tablet": { "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", "propertyNames": { @@ -339,7 +338,7 @@ } } }, - "wearable": { + "tv": { "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", "propertyNames": { @@ -392,7 +391,7 @@ } } }, - "liteWearable": { + "wearable": { "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", "propertyNames": { @@ -498,59 +497,6 @@ } } }, - "smartVision": { - "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", - "propertyNames": { - "enum": [ - "minAPIVersion", - "distributedNotificationEnabled", - "keepAlive", - "removable", - "singleton", - "userDataClearable", - "accessible" - ] - }, - "properties": { - "minAPIVersion": { - "description": "Indicates the minimum API version required for running an application. This label is an integer and can be defaulted.", - "type": "integer", - "minimum": 0, - "maximum": 2147483647 - }, - "distributedNotificationEnabled": { - "description": "Describes whether the application has distributed notifications.", - "type": "boolean", - "default": false - }, - "keepAlive": { - "description": "Specifies whether the application will keep alive. This attribute takes effect only when the system application or privilege application is used.", - "type": "boolean", - "default": false - }, - "removable": { - "description": "Describes the application can remove or not. This attribute takes effect only when the system application or privilege application is used.", - "type": "boolean", - "default": true - }, - "singleton": { - "description": "Describes whether the application is singleton mode. This attribute takes effect only when the system application or privilege application is used.", - "type": "boolean", - "default": false - }, - "userDataClearable": { - "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": "Describes whether to visit the application install catalogue. This attribute takes effect only when the system application or privilege application is used. And the aplpication must be a stage module", - "type": "boolean", - "default": false - } - } - }, "router": { "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", diff --git a/modulecheck/module.json b/modulecheck/module.json index ea6f66a9..1285c6ef 100644 --- a/modulecheck/module.json +++ b/modulecheck/module.json @@ -128,6 +128,7 @@ "items": { "type": "string", "enum": [ + "default", "phone", "tablet", "tv", -- Gitee