From 0901f77d195a6079bf7ab69405fe07e7539c8c2d Mon Sep 17 00:00:00 2001
From: longwei <longwei27@huawei.com>
Date: Thu, 28 Apr 2022 18:44:12 +0800
Subject: [PATCH] fix parse config.json file

Change-Id: Ic30c046b69be9a76807fa18d4abf406f8217ae2d
---
 adapter/ohos/JsonUtil.java       | 20 +++++++++-----------
 adapter/ohos/ModuleAdaption.java |  1 +
 adapter/ohos/ModuleResult.java   |  4 ++--
 adapter/ohos/Uncompress.java     |  2 ++
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/adapter/ohos/JsonUtil.java b/adapter/ohos/JsonUtil.java
index d6f799c2..8a46a4cc 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 ad32fae7..e0036956 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 d75e2112..bec13b78 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 d88f0152..9ba701cd 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");
-- 
Gitee