From 946a4af079a941e0a575e8d4e5c6bde345ca6963 Mon Sep 17 00:00:00 2001
From: z30034863 <zhangfengzhuang@huawei.com>
Date: Sun, 8 Jun 2025 10:47:57 +0800
Subject: [PATCH] Do not parse extensionAbility iconID/lableID

Signed-off-by: z30034863 <zhangfengzhuang@huawei.com>
---
 adapter/ohos/ExtensionAbilityInfo.java | 26 --------------------------
 adapter/ohos/JsonUtil.java             |  6 ------
 2 files changed, 32 deletions(-)

diff --git a/adapter/ohos/ExtensionAbilityInfo.java b/adapter/ohos/ExtensionAbilityInfo.java
index c9ff92ab..f7c614de 100644
--- a/adapter/ohos/ExtensionAbilityInfo.java
+++ b/adapter/ohos/ExtensionAbilityInfo.java
@@ -92,16 +92,6 @@ public class ExtensionAbilityInfo {
      */
     private HashMap<String, String> labels = new HashMap<>();
 
-    /**
-     * Indicates the iconId of module ModuleJson.
-     */
-    private int iconId = 0;
-
-    /**
-     * Indicates the labelId of module ModuleJson.
-     */
-    private int labelId = 0;
-
     public HashMap<String, String> getLabels() {
         return labels;
     }
@@ -117,20 +107,4 @@ public class ExtensionAbilityInfo {
     public void setLabels(HashMap<String, String> labels) {
         this.labels = labels;
     }
-
-    public int getIconId() {
-        return iconId;
-    }
-
-    public void setIconId(int iconId) {
-        this.iconId = iconId;
-    }
-
-    public int getLabelId() {
-        return labelId;
-    }
-
-    public void setLabelId(int labelId) {
-        this.labelId = labelId;
-    }
 }
diff --git a/adapter/ohos/JsonUtil.java b/adapter/ohos/JsonUtil.java
index 74ba0f65..56b72f0d 100644
--- a/adapter/ohos/JsonUtil.java
+++ b/adapter/ohos/JsonUtil.java
@@ -1289,14 +1289,8 @@ public class JsonUtil {
             moduleExtensionAbilityInfo.srcEntrance = getJsonString(extensionAbilityJson, SRC_ENTRANCE);
         }
         moduleExtensionAbilityInfo.icon = parseIconById(extensionAbilityJson, data);
-        if (extensionAbilityJson.containsKey(ICON_ID)) {
-            moduleExtensionAbilityInfo.setIconId(extensionAbilityJson.getIntValue(ICON_ID));
-        }
         moduleExtensionAbilityInfo.label =
                 parseResourceByKey(extensionAbilityJson, data, LABEL, LABEL_ID);
-        if (extensionAbilityJson.containsKey(LABEL_ID)) {
-            moduleExtensionAbilityInfo.setLabelId(extensionAbilityJson.getIntValue(LABEL_ID));
-        }
         moduleExtensionAbilityInfo.setLabels(parseResourceMapByKey(extensionAbilityJson, data, LABEL_ID));
         moduleExtensionAbilityInfo.description =
                 parseResourceByKey(extensionAbilityJson, data, DESCRIPTION, DESCRIPTION_ID);
-- 
Gitee