From 1b2f8d301112ca107e95a2198b14edaea4b73b7d Mon Sep 17 00:00:00 2001 From: zhaogan Date: Sat, 26 Aug 2023 17:11:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fixed=20f566a6d=20from=20https://gitee.com/?= =?UTF-8?q?zhaogan0603/developtools=5Fpacking=5Ftool/pulls/608=20ssue:=20#?= =?UTF-8?q?I7Q490=20Description:distributionFilter=E5=94=AF=E4=B8=80?= =?UTF-8?q?=E6=80=A7=E6=A0=A1=E9=AA=8C=20Sig:=20SIG=5FApplicaitonFramework?= =?UTF-8?q?=20Feature=20or=20Bugfix:=20Feature=20Binary=20Source:=20No?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhaogan --- adapter/ohos/JsonUtil.java | 4 +--- adapter/ohos/ModuleJsonUtil.java | 27 ++++++++++++--------------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/adapter/ohos/JsonUtil.java b/adapter/ohos/JsonUtil.java index a11d44f7..82be70a0 100644 --- a/adapter/ohos/JsonUtil.java +++ b/adapter/ohos/JsonUtil.java @@ -1168,10 +1168,8 @@ public class JsonUtil { * * @param moduleMetadataInfos metedata in moduleInfo * @return the parse result - * @throws BundleException Throws this exception if the json is not standard. */ - static DistroFilter parseModuleDistrofilterFromMetadata( - List moduleMetadataInfos) throws BundleException { + static DistroFilter parseModuleDistrofilterFromMetadata(List moduleMetadataInfos) { for (ModuleMetadataInfo moduleMetadataInfo : moduleMetadataInfos) { String resource = moduleMetadataInfo.resource; if (resource.isEmpty()) { diff --git a/adapter/ohos/ModuleJsonUtil.java b/adapter/ohos/ModuleJsonUtil.java index 66c6561b..faeaf2b4 100644 --- a/adapter/ohos/ModuleJsonUtil.java +++ b/adapter/ohos/ModuleJsonUtil.java @@ -66,6 +66,7 @@ class ModuleJsonUtil { private static final String VALUE = "value"; private static final String JSON_PERFIX = ".json"; private static final String DISTRO_FILTER = "distroFilter"; + private static final String DISTRIBUTION_FILTER = "distributionFilter"; private static final String DEPENDENCIES = "dependencies"; private static final String EXTENSION_ABILITIES = "extensionAbilities"; private static final String INSTALLATION_FREE = "installationFree"; @@ -1011,26 +1012,22 @@ class ModuleJsonUtil { * @param moduleMetadataInfos all metadata of module * @return DistroFilter is the result of parsed distroFilter */ - public static DistroFilter parseStageDistroFilter( - List moduleMetadataInfos) throws BundleException { - DistroFilter distroFilter = new DistroFilter(); + public static DistroFilter parseStageDistroFilter(List moduleMetadataInfos) { + DistroFilter distro = new DistroFilter(); for (ModuleMetadataInfo moduleMetadataInfo : moduleMetadataInfos) { - if (moduleMetadataInfo.resource.isEmpty()) { + String resource = moduleMetadataInfo.resource; + if (resource.isEmpty()) { continue; } - try { - JSONObject distroFilterObj = JSON.parseObject(moduleMetadataInfo.resource); - if (distroFilterObj.containsKey(DISTRO_FILTER)) { - distroFilter = JSONObject.parseObject(getJsonString(distroFilterObj, - DISTRO_FILTER), DistroFilter.class); - } - } catch (JSONException exception) { - String errMsg = "parse JSONobject failed."; - LOG.error(errMsg); - throw new BundleException(errMsg); + JSONObject distroFilter = JSONObject.parseObject(resource); + if (distroFilter.containsKey(DISTRIBUTION_FILTER)) { + return JSONObject.parseObject(getJsonString(distroFilter, DISTRIBUTION_FILTER), DistroFilter.class); + } + if (distroFilter.containsKey(DISTRO_FILTER)) { + return JSONObject.parseObject(getJsonString(distroFilter, DISTRO_FILTER), DistroFilter.class); } } - return distroFilter; + return distro; } /** -- Gitee From 459c9b95e4eb5fe1a8d5e5665534b132aa746157 Mon Sep 17 00:00:00 2001 From: zhaogan Date: Fri, 1 Sep 2023 14:33:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fixed=2009b3341=20from=20https://gitee.com/?= =?UTF-8?q?zhaogan0603/developtools=5Fpacking=5Ftool/pulls/610=20ssue:=20#?= =?UTF-8?q?I7XSKL=20Description:=E8=A7=A3=E5=86=B3=E6=8B=86=E5=8C=85?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E8=A7=A3=E6=9E=90resources.index=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98=20Sig:=20SIG=5FApplicaitonFramework?= =?UTF-8?q?=20Feature=20or=20Bugfix:=20Feature=20Binary=20Source:=20No?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhaogan --- adapter/ohos/ResourcesParser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adapter/ohos/ResourcesParser.java b/adapter/ohos/ResourcesParser.java index a2181983..61eda90e 100644 --- a/adapter/ohos/ResourcesParser.java +++ b/adapter/ohos/ResourcesParser.java @@ -416,7 +416,7 @@ public class ResourcesParser { item.size = buf.getInt(); item.type = buf.getInt(); item.id = buf.getInt(); - int len = buf.getShort(); + int len = buf.getShort() & 0xFFFF; byte[] value = new byte[len]; buf.get(value); item.value = new String(value, StandardCharsets.UTF_8); -- Gitee