diff --git a/adapter/ohos/JsonUtil.java b/adapter/ohos/JsonUtil.java index d6f799c21419acb937e0c8144e90ccb0dc076bf5..8a46a4cc1f8cca2ad9cb6997681e888f49db8769 100644 --- a/adapter/ohos/JsonUtil.java +++ b/adapter/ohos/JsonUtil.java @@ -845,17 +845,12 @@ public class JsonUtil { } // parse appName - if (moduleProfileInfo.moduleInfo.abilities.size() == 1) { - moduleProfileInfo.moduleAppInfo.appName = moduleProfileInfo.moduleInfo.abilities.get(0).label; - moduleProfileInfo.moduleAppInfo.appNameEN = moduleProfileInfo.moduleInfo.abilities.get(0).label; - } else { - for (ModuleAbilityInfo abilityInfo : moduleProfileInfo.moduleInfo.abilities) { - for (SkillInfo skill : abilityInfo.skills) { - if (skill.actions.contains(ACTION_SYSTEM_HOME) && skill.entities.contains(ENTITY_SYSTEM_HOME)) { - moduleProfileInfo.moduleAppInfo.appName = abilityInfo.label; - moduleProfileInfo.moduleAppInfo.appNameEN = abilityInfo.label; - break; - } + for (ModuleAbilityInfo abilityInfo : moduleProfileInfo.moduleInfo.abilities) { + for (SkillInfo skill : abilityInfo.skills) { + if (skill.actions.contains(ACTION_SYSTEM_HOME) && skill.entities.contains(ENTITY_SYSTEM_HOME)) { + moduleProfileInfo.moduleAppInfo.appName = abilityInfo.label; + moduleProfileInfo.moduleAppInfo.appNameEN = abilityInfo.label; + break; } } } @@ -942,6 +937,9 @@ public class JsonUtil { // parse abilities if (moduleJson.containsKey("abilities")) { moduleInfo.abilities = parseModuleAbilities(moduleJson, data, profileJsons); + for (ModuleAbilityInfo abilityInfo : moduleInfo.abilities) { + moduleInfo.moduleShortcuts.addAll(parseShortcut(abilityInfo.metadata, data)); + } } // parse extensionabilities if (moduleJson.containsKey("extensionAbilities")) { diff --git a/adapter/ohos/ModuleAdaption.java b/adapter/ohos/ModuleAdaption.java index ad32fae73460757bf1b4b5ae537b4f598abf650f..e0036956a0055e5024d00a7f567b1061b5dbb8d9 100644 --- a/adapter/ohos/ModuleAdaption.java +++ b/adapter/ohos/ModuleAdaption.java @@ -25,6 +25,7 @@ class ModuleAdaption { for (int i = 0; i < moduleResult.moduleProfileInfos.size(); ++i) { ModuleProfileInfo moduleProfileInfo = moduleResult.moduleProfileInfos.get(i); ProfileInfo profileInfo = new ProfileInfo(); + profileInfo.hapName = moduleProfileInfo.hapName; // adapt appInfo profileInfo.appInfo = convertToAppInfo(moduleProfileInfo.moduleAppInfo); //adapt deviceconfig diff --git a/adapter/ohos/ModuleResult.java b/adapter/ohos/ModuleResult.java index d75e2112953cf24be8ec9e36912ad66529dbae97..bec13b7809fdc51047b4d43b8cda1851a5e94267 100644 --- a/adapter/ohos/ModuleResult.java +++ b/adapter/ohos/ModuleResult.java @@ -27,11 +27,11 @@ class ModuleResult { /** * Indicates the result of ModuleJson. */ - private boolean result = false; + private boolean result = true; /** * Indicates the message of ModuleJson. */ - private String message = ""; + private String message = "Success"; public boolean getResult() { return result; diff --git a/adapter/ohos/Uncompress.java b/adapter/ohos/Uncompress.java index d88f0152e266d82efeef19e6e395c6a66300eed8..9ba701cdb458e90e428e99d9a0dfec6eb5acaa04 100644 --- a/adapter/ohos/Uncompress.java +++ b/adapter/ohos/Uncompress.java @@ -277,6 +277,7 @@ public class Uncompress { compressResult = unCompressModuleHap(deviceType, hapPath, MODULE_JSON); } else { compressResult = uncompress(deviceType, hapPath, HARMONY_PROFILE); + compressResult = obtainLabelAndIcon(compressResult); } } catch (BundleException e) { LOG.error("Uncompress::uncompressHapByPath Bundle exception"); @@ -323,6 +324,7 @@ public class Uncompress { } else { InputStream parseInput = new ByteArrayInputStream(outputStream.toByteArray()); compressResult = uncompressByInput(deviceType, parseInput, HARMONY_PROFILE); + compressResult = obtainLabelAndIcon(compressResult); } } catch (BundleException e) { LOG.error("Uncompress::uncompressHapByStream Bundle exception");