diff --git a/adapter/ohos/JsonUtil.java b/adapter/ohos/JsonUtil.java index a1bc20a2ad8bcf43b792bc4f724a2f9ba1afb4e0..2a0247cb9e8345c252a107d784b7f87d740429c4 100644 --- a/adapter/ohos/JsonUtil.java +++ b/adapter/ohos/JsonUtil.java @@ -87,6 +87,7 @@ public class JsonUtil { private static final String ENTITY_TYPE = "entityType"; private static final String UNSPECIFIED = "unspecified"; private static final String SRC_ENTRANCE = "srcEntrance"; + private static final String SRC_ENTRY = "srcEntry"; private static final String PROCESS = "process"; private static final String PHONE = "phone"; private static final String TABLET = "tablet"; @@ -116,12 +117,14 @@ public class JsonUtil { private static final String USED_SCENE = "usedScene"; private static final String DEFINE_PERMISSIONS = "definePermissions"; private static final String DISTRO_FILTER = "distroFilter"; + private static final String DISTRIBUTION_FILTER = "distributionFilter"; private static final String LAUNCH_TYPE = "launchType"; private static final String STANDARD = "standard"; private static final String PERMISSIONS = "permissions"; private static final String READ_PERMISSION = "readPermission"; private static final String WRITE_PERMISSION = "writePermission"; private static final String VISIBLE = "visible"; + private static final String EXPORTED = "exported"; private static final String CONTINUABLE = "continuable"; private static final String SKILLS = "skills"; private static final String BACKGROUND_MODES = "backgroundModes"; @@ -801,8 +804,11 @@ public class JsonUtil { String.class); } - if (abilityJson.containsKey("visible")) { - ability.visible = abilityJson.getBoolean("visible"); + if (abilityJson.containsKey(VISIBLE)) { + ability.visible = abilityJson.getBoolean(VISIBLE); + } + if (abilityJson.containsKey(EXPORTED)) { + ability.visible = abilityJson.getBoolean(EXPORTED); } if (abilityJson.containsKey("configChanges")) { @@ -1004,7 +1010,12 @@ public class JsonUtil { moduleInfo.name = getJsonString(moduleJson, NAME); moduleInfo.type = getJsonString(moduleJson, TYPE); - moduleInfo.srcEntrance = getJsonString(moduleJson, SRC_ENTRANCE); + if (moduleJson.containsKey(SRC_ENTRANCE)) { + moduleInfo.srcEntrance = getJsonString(moduleJson, SRC_ENTRANCE); + } else { + moduleInfo.srcEntrance = getJsonString(moduleJson, SRC_ENTRY); + } + moduleInfo.description = parseResourceByKey(moduleJson, data, DESCRIPTION, DESCRIPTION_ID); moduleInfo.setDescriptions(parseResourceMapByKey(moduleJson, data, DESCRIPTION_ID)); if (moduleJson.containsKey(PROCESS)) { @@ -1095,6 +1106,9 @@ public class JsonUtil { if (distroFilter.containsKey(DISTRO_FILTER)) { return JSONObject.parseObject(getJsonString(distroFilter, DISTRO_FILTER), DistroFilter.class); } + if (distroFilter.containsKey(DISTRIBUTION_FILTER)) { + return JSONObject.parseObject(getJsonString(distroFilter, DISTRIBUTION_FILTER), DistroFilter.class); + } } return null; } @@ -1152,7 +1166,11 @@ public class JsonUtil { } ExtensionAbilityInfo moduleExtensionAbilityInfo = new ExtensionAbilityInfo(); moduleExtensionAbilityInfo.name = getJsonString(extensionAbilityJson, NAME); - moduleExtensionAbilityInfo.srcEntrance = getJsonString(extensionAbilityJson, SRC_ENTRANCE); + if (extensionAbilityJson.containsKey(SRC_ENTRANCE)) { + moduleExtensionAbilityInfo.srcEntrance = getJsonString(extensionAbilityJson, SRC_ENTRANCE); + } else { + moduleExtensionAbilityInfo.srcEntrance = getJsonString(extensionAbilityJson, SRC_ENTRY); + } moduleExtensionAbilityInfo.icon = parseIconById(extensionAbilityJson, data); moduleExtensionAbilityInfo.label = parseResourceByKey(extensionAbilityJson, data, LABEL, LABEL_ID); @@ -1181,7 +1199,11 @@ public class JsonUtil { ModuleAdaption adaption = new ModuleAdaption(); moduleExtensionAbilityInfo.metadata = adaption.convertToMetadata(moduleExtensionAbilityInfo.metadataInfos); } - moduleExtensionAbilityInfo.visible = getJsonBooleanValue(extensionAbilityJson, VISIBLE, false); + if (extensionAbilityJson.containsKey(VISIBLE)) { + moduleExtensionAbilityInfo.visible = getJsonBooleanValue(extensionAbilityJson, VISIBLE, false); + } else { + moduleExtensionAbilityInfo.visible = getJsonBooleanValue(extensionAbilityJson, EXPORTED, false); + } return moduleExtensionAbilityInfo; } @@ -1232,7 +1254,11 @@ public class JsonUtil { } ModuleAbilityInfo moduleAbilityInfo = new ModuleAbilityInfo(); moduleAbilityInfo.name = getJsonString(abilityJson, NAME); - moduleAbilityInfo.srcEntrance = getJsonString(abilityJson, SRC_ENTRANCE); + if (abilityJson.containsKey(SRC_ENTRANCE)) { + moduleAbilityInfo.srcEntrance = getJsonString(abilityJson, SRC_ENTRANCE); + } else { + moduleAbilityInfo.srcEntrance = getJsonString(abilityJson, SRC_ENTRY); + } moduleAbilityInfo.launchType = getJsonString(abilityJson, LAUNCH_TYPE, STANDARD); moduleAbilityInfo.description = parseResourceByKey(abilityJson, data, DESCRIPTION, DESCRIPTION_ID); moduleAbilityInfo.setDescriptions(parseResourceMapByKey(abilityJson, data, DESCRIPTION_ID)); @@ -1245,7 +1271,12 @@ public class JsonUtil { getJsonString(abilityJson, PERMISSIONS), String.class); } moduleAbilityInfo.metadata = parseModuleMetadataInfos(abilityJson, data, profileJsons); - moduleAbilityInfo.visible = getJsonBooleanValue(abilityJson, VISIBLE, false); + if (abilityJson.containsKey(VISIBLE)) { + moduleAbilityInfo.visible = getJsonBooleanValue(abilityJson, VISIBLE, false); + } else { + moduleAbilityInfo.visible = getJsonBooleanValue(abilityJson, EXPORTED, false); + } + moduleAbilityInfo.continuable = getJsonBooleanValue(abilityJson, CONTINUABLE, false); if (abilityJson.containsKey(SKILLS)) {