remove utilcode

haife · Dec 27, 2021 · 560ccb1 · 560ccb1
1 parent 51feaff
commit 560ccb1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/mcas/src/main/java/com/haife/mcas/base/BaseSupportActivity.java b/mcas/src/main/java/com/haife/mcas/base/BaseSupportActivity.java
@@ -12,7 +12,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.blankj.utilcode.util.ScreenUtils;
 import com.haife.mcas.mvp.IPresenter;
 
 import java.lang.reflect.Field;
@@ -61,7 +60,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             fixOrientation();
         }
         //固定屏幕方向
-        ScreenUtils.setPortrait(this);
+
         mContext = this;
         mDelegate.onCreate(savedInstanceState);
 

diff --git a/mcas/src/main/java/com/haife/mcas/mvp/BaseModel.java b/mcas/src/main/java/com/haife/mcas/mvp/BaseModel.java
@@ -7,7 +7,6 @@
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.OnLifecycleEvent;
 
-import com.blankj.utilcode.util.StringUtils;
 import com.haife.mcas.integration.IRepositoryManager;
 
 import java.lang.reflect.Field;
@@ -40,7 +39,7 @@ public BaseModel(IRepositoryManager repositoryManager) {
      * @param key
      * @return
      */
-    public static HashMap<String,Object> encryptObjectToMap(@Nullable Object obj, String key) {
+    public static HashMap<String, Object> encryptObjectToMap(@Nullable Object obj, String key) {
         if (obj != null) {
             try {
                 HashMap<String, Object> map = new HashMap<>();
@@ -50,7 +49,7 @@ public static HashMap<String,Object> encryptObjectToMap(@Nullable Object obj, St
                     map.put(field.getName(), field.get(obj));
                 }
                 map.put("64", getMacData(map, key));
-               return map;
+                return map;
             } catch (Exception ignored) {
 
             }
@@ -93,13 +92,13 @@ public static String getMacData(HashMap<String, Object> map, String key) throws
         Map<String, Object> resultMap = sortMapByKey(map);
         String sign = "";
         for (Map.Entry<String, Object> entry : resultMap.entrySet()) {
-            if (StringUtils.isEmpty(sign)) {
+            if (sign != null && !sign.isEmpty()) {
                 sign = String.valueOf(entry.getValue());
             } else {
                 sign += entry.getValue();
             }
         }
-        if (!StringUtils.isEmpty(sign)) {
+        if (sign != null && !sign.isEmpty()) {
             sign += key;
         }
         return sign;