From ee03c81d54a590cdeb01f73c8834612cdb7b6673 Mon Sep 17 00:00:00 2001
From: linxiangzhi <linxiangzhi@huawei.com>
Date: Tue, 20 Sep 2022 14:23:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E6=B8=85=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: linxiangzhi <linxiangzhi@huawei.com>
Change-Id: I2a88fe8777c0b7f0a6c7b4db91ad0880f90a8881
---
 adapter/ohos/JsonUtil.java       | 8 ++++----
 adapter/ohos/ModuleJsonUtil.java | 2 +-
 adapter/ohos/Uncompress.java     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/adapter/ohos/JsonUtil.java b/adapter/ohos/JsonUtil.java
index bbfd9c14..51b7e0e9 100644
--- a/adapter/ohos/JsonUtil.java
+++ b/adapter/ohos/JsonUtil.java
@@ -1277,7 +1277,7 @@ public class JsonUtil {
         for (ExtensionAbilityInfo extensionAbilityInfo : extensionAbilityInfos) {
             List<AbilityFormInfo> 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 46d7161a..7db70d57 100644
--- a/adapter/ohos/ModuleJsonUtil.java
+++ b/adapter/ohos/ModuleJsonUtil.java
@@ -731,7 +731,7 @@ class ModuleJsonUtil {
         }
         List<String> 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 cb7def48..89535d6e 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 {
-- 
Gitee