diff --git a/adapter/ohos/JsonUtil.java b/adapter/ohos/JsonUtil.java index bbfd9c142afd322580c043663c9a57653f065545..51b7e0e9e2bc495cdb0cb0aae4c14b8b63047c4d 100644 --- a/adapter/ohos/JsonUtil.java +++ b/adapter/ohos/JsonUtil.java @@ -1277,7 +1277,7 @@ public class JsonUtil { for (ExtensionAbilityInfo extensionAbilityInfo : extensionAbilityInfos) { List formInfos = parseModuleFormInfoInMetadata(data, extensionAbilityInfo.metadataInfos); - if (extensionAbilityInfo.type.equals(FORM)) { + if (FORM.equals(extensionAbilityInfo.type)) { for (AbilityFormInfo formInfo : formInfos) { formInfo.providerAbility = serviceProviderAbility; } @@ -1793,10 +1793,10 @@ public class JsonUtil { String serviceProviderAbility = parseFAServiceProviderAbility(moduleJson, abilityInfos); for (AbilityInfo abilityInfo : abilityInfos) { if (!abilityInfo.formInfos.isEmpty()) { - if (abilityInfo.type.equals(SERVICE)) { + if (SERVICE.equals(abilityInfo.type)) { setProviderAbilityForForm(abilityInfo.formInfos, serviceProviderAbility); } - if (abilityInfo.type.equals(PAGE)) { + if (PAGE.equals(abilityInfo.type)) { setProviderAbilityForForm(abilityInfo.formInfos, abilityInfo.name); } hapInfo.formInfos.addAll(abilityInfo.formInfos); @@ -1841,7 +1841,7 @@ public class JsonUtil { } } for (AbilityInfo abilityInfo : abilityInfos) { - if (abilityInfo.type.equals(PAGE)) { + if (PAGE.equals(abilityInfo.type)) { return abilityInfo.name; } } diff --git a/adapter/ohos/ModuleJsonUtil.java b/adapter/ohos/ModuleJsonUtil.java index 46d7161a9c97f006ac7f2c41cbbe45f635f316c0..7db70d570c25706086e6a67f2111ebcefed2dfe3 100644 --- a/adapter/ohos/ModuleJsonUtil.java +++ b/adapter/ohos/ModuleJsonUtil.java @@ -731,7 +731,7 @@ class ModuleJsonUtil { } List deviceTypes = new ArrayList<>(); String type = moduleObj.getString(TYPE); - if (type != null && type.equals(ENTRY)) { + if (type != null && ENTRY.equals(type)) { deviceTypes = getDeviceTypesFromStageModule(moduleObj); } diff --git a/adapter/ohos/Uncompress.java b/adapter/ohos/Uncompress.java index cb7def4880abf77c40f89138d3f3201a7e8842bb..89535d6e800177990ce6aee5a34c0a568044f37c 100644 --- a/adapter/ohos/Uncompress.java +++ b/adapter/ohos/Uncompress.java @@ -120,7 +120,7 @@ public class Uncompress { * @param utility common data */ static void unpackageHapMode(Utility utility) throws BundleException { - if (!utility.getMode().equals(Utility.MODE_HAP)) { + if (!Utility.MODE_HAP.equals(utility.getMode())) { throw new BundleException("Uncompress::unpackageHapMode input wrong unpack mode"); } try {