Merge pull request Blankj#761 from Blankj/1.22.5

1.22.5

Author: Blankj

CHANGELOG.md

@@ -1,4 +1,5 @@
-* `18/12/19` [fix] ToastUtils multi show crash when run API 25. Publish v1.22.4.
+* `18/12/19` [fix] AdaptScreenUtils not work in MIUI on Android 5.1.1. Publish v1.22.5.
+* `18/12/18` [fix] ToastUtils multi show crash when run API 25. Publish v1.22.4.
 * `18/12/18` [fix] ImageUtils recycle ret equals src. Publish v1.22.3.
 * `18/12/17` [fix] Utils$FileProvider4UtilCode not found. Publish v1.22.3.
 * `18/12/17` [fix] ToastUtils leak. Publish v1.22.2.

README-CN.md

@@ -41,7 +41,7 @@
 
 [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
 
-[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.4-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.5-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

README.md

@@ -41,7 +41,7 @@ If this project helps you a lot and you want to support the project's developmen
 
 [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
 
-[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.4-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.5-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

config.gradle

@@ -5,8 +5,8 @@ ext {
     compileSdkVersion = 27
     minSdkVersion = 14
     targetSdkVersion = 27
-    versionCode = 1_022_004
-    versionName = '1.22.4'// E.g. 1.9.72 => 1,009,072
+    versionCode = 1_022_005
+    versionName = '1.22.5'// E.g. 1.9.72 => 1,009,072
 
     bus = [
             isDebug: false,

lib/base/build.gradle

@@ -15,5 +15,5 @@ dependencies {
     api dep.free_proguard
     api 'com.r0adkll:slidableactivity:2.0.5'
     compileOnly dep.leakcanary.android_no_op
-//    api 'com.blankj:utilcode:1.22.4'
+//    api 'com.blankj:utilcode:1.22.5'
 }

utilcode/README-CN.md

@@ -2,7 +2,7 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.22.4'
+implementation 'com.blankj:utilcode:1.22.5'
 ```
 
 

utilcode/README-STATIC-BUS.md

@@ -27,7 +27,7 @@ apply plugin: "com.blankj.bus"
 给 base 模块添加 [AndroidUtilCode](https://github.com/Blankj/AndroidUtilCode) 依赖：
 
 ```groovy
-api "com.blankj:utilcode:1.22.4"
+api "com.blankj:utilcode:1.22.5"
 ```
 
 比如 module0 中存在的 `Module0Activity.java`，我们通常都是在它内部写一个 `start` 函数来启动它，现在我们给它添加 `@BusUtils.Subscribe` 注解，并给注解的 `name` 赋唯一值，要注意，函数务必要 `public static` 哦：

utilcode/README.md

@@ -2,7 +2,7 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.22.4'
+implementation 'com.blankj:utilcode:1.22.5'
 ```
 
 

utilcode/lib/src/main/java/com/blankj/utilcode/util/AdaptScreenUtils.java

@@ -2,17 +2,23 @@
 
 import android.content.res.Resources;
 import android.util.DisplayMetrics;
+import android.util.Log;
+
+import java.lang.reflect.Field;
 
 
 public final class AdaptScreenUtils {
 
+    private static boolean isInitMiui = false;
+    private static Field   mTmpMetrics;
+
     private static DisplayMetrics appDm;
 
     /**
      * Adapt for the horizontal screen, and call it in [android.app.Activity.getResources].
      */
     public static Resources adaptWidth(Resources resources, int designWidth) {
-        DisplayMetrics dm = resources.getDisplayMetrics();
+        DisplayMetrics dm = getDisplayMetrics(resources);
         float newXdpi = dm.xdpi = (dm.widthPixels * 72f) / designWidth;
         setAppDmXdpi(newXdpi);
         return resources;
@@ -22,7 +28,7 @@ public static Resources adaptWidth(Resources resources, int designWidth) {
      * Adapt for the vertical screen, and call it in [android.app.Activity.getResources].
      */
     public static Resources adaptHeight(Resources resources, int designHeight) {
-        DisplayMetrics dm = resources.getDisplayMetrics();
+        DisplayMetrics dm = getDisplayMetrics(resources);
         float newXdpi = dm.xdpi = (dm.heightPixels * 72f) / designHeight;
         setAppDmXdpi(newXdpi);
         return resources;
@@ -33,7 +39,7 @@ public static Resources adaptHeight(Resources resources, int designHeight) {
      * @return the resource
      */
     public static Resources closeAdapt(Resources resources) {
-        DisplayMetrics dm = resources.getDisplayMetrics();
+        DisplayMetrics dm = getDisplayMetrics(resources);
         float newXdpi = dm.xdpi = dm.density * 72;
         setAppDmXdpi(newXdpi);
         return resources;
@@ -67,4 +73,34 @@ private static void setAppDmXdpi(final float xdpi) {
         }
         appDm.xdpi = xdpi;
     }
+
+    private static DisplayMetrics getDisplayMetrics(Resources resources) {
+        DisplayMetrics miuiDisplayMetrics = getMiuiTmpMetrics(resources);
+        if (miuiDisplayMetrics == null) return resources.getDisplayMetrics();
+        return miuiDisplayMetrics;
+    }
+
+    private static DisplayMetrics getMiuiTmpMetrics(Resources resources) {
+        if (!isInitMiui) {
+            DisplayMetrics ret = null;
+            String simpleName = resources.getClass().getSimpleName();
+            if ("MiuiResources".equals(simpleName) || "XResources".equals(simpleName)) {
+                try {
+                    mTmpMetrics = Resources.class.getDeclaredField("mTmpMetrics");
+                    mTmpMetrics.setAccessible(true);
+                    ret = (DisplayMetrics) mTmpMetrics.get(resources);
+                } catch (Exception e) {
+                    Log.e("AdaptScreenUtils", "no field of mTmpMetrics in resources.");
+                }
+            }
+            isInitMiui = true;
+            return ret;
+        }
+        if (mTmpMetrics == null) return null;
+        try {
+            return (DisplayMetrics) mTmpMetrics.get(resources);
+        } catch (Exception e) {
+            return null;
+        }
+    }
 }

utilcode/lib/src/main/java/com/blankj/utilcode/util/BusUtils.java

@@ -7,8 +7,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * <pre>
@@ -22,8 +20,7 @@
  */
 public final class BusUtils {
 
-    private static final Object              NULL  = new Object();
-    private static final Map<Object, String> BUSES = new ConcurrentHashMap<>();
+    private static final Object NULL = new Object();
 
     public static <T> T post(final String name, final Object... objects) {
         if (name == null || name.length() == 0) return null;
@@ -35,17 +32,6 @@ public static <T> T post(final String name, final Object... objects) {
         return (T) o;
     }
 
-
-    public static void register(final Object bus) {
-
-    }
-
-    public static void unregister(final Object bus) {
-
-    }
-
-
-
     private static Object injectShell(final String name, final Object[] objects) {
         return NULL;
     }
@@ -54,5 +40,76 @@ private static Object injectShell(final String name, final Object[] objects) {
     @Retention(RetentionPolicy.CLASS)
     public @interface Subscribe {
         String name() default "";
+
+        int priority() default 0;
     }
+
+//    private static final Map<String, TreeSet<Bus>> BUSES = new ConcurrentHashMap<>();
+
+//    public static void register(final Object bus) {
+//        Class c = null;
+//        if (bus.getClass().equals(c)) {
+//
+//        }
+//    }
+
+//    public static void unregister(final Object bus) {
+//        if (bus == null) return;
+//        Class busClass = bus.getClass();
+//        if (BUSES.containsKey(busClass)) {
+//
+//        }
+//    }
+
+//    private static Object inject(final String name, int priority ){
+//        if (!BUSES.containsKey(name)) return NULL;
+//        TreeSet<Bus> buses = BUSES.get(name);
+//        for (Bus bus : buses) {
+//            bus.
+//        }
+//        return NULL;
+//    }
+
+//    static class Bus implements Comparable<Bus> {
+//
+//        TreeMap<Object, Integer> mTreeMap;
+//
+//        Bus(Object object) {
+//            this(object, 0);
+//        }
+//
+//        Bus(Object object, int priority) {
+//            mTreeMap = new TreeMap<>();
+//            this.priority = priority;
+//        }
+//
+//        @Override
+//        public int compareTo(@NonNull Bus o) {
+//            return (this.priority < o.priority) ? 1 : ((this.priority == o.priority) ? 0 : -1);
+//        }
+//
+//        @Override
+//        public boolean equals(Object obj) {
+//            return ObjectUtils.equals(this, obj);
+//        }
+//
+//        @Override
+//        public String toString() {
+//            return mObject.toString() + ": " + priority;
+//        }
+//    }
+//
+//    public static void main(String[] args) {
+//        TreeSet<Bus> queue = new TreeSet<>();
+//        Bus bus0 = new Bus("", 1);
+//        Bus bus1 = new Bus("", 2);
+//        Bus bus2 = new Bus("", 3);
+//        Bus bus3 = new Bus("", 3);
+//        queue.add(bus1);
+//        queue.add(bus2);
+//        queue.add(bus0);
+//
+//        System.out.println(queue);
+//
+//    }
 }