see 04/26 log

Blankj · Blankj · commit 1fb408022f52 · 2020-04-26T14:01:50.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,4 @@
+* `20/04/26` [fix] Utils#init fit tinker. Publish 1.28.3.
 * `20/04/25` [fix] UriUtils#uri2File Unknown URI. Publish 1.28.2.
 * `20/04/24` [add] SnackbarUtils support show on the top; UriUtils#uri2InputStream.
 * `20/04/23` [fix] UriUtils#uri2File not support HW; TransActivity crash below 21.
diff --git a/buildSrc/src/main/groovy/Config.groovy b/buildSrc/src/main/groovy/Config.groovy
@@ -15,7 +15,7 @@ class Config {
     static minSdkVersion = 14
     static targetSdkVersion = 29
     static versionCode = 1_028_002
-    static versionName = '1.28.2'// E.g. 1.9.72 => 1,009,072
+    static versionName = '1.28.3'// E.g. 1.9.72 => 1,009,072
 
     // lib version
     static gradlePluginVersion = '3.5.0'
diff --git a/lib/utilcode/README-CN.md b/lib/utilcode/README-CN.md
@@ -2,10 +2,10 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.28.2'
+implementation 'com.blankj:utilcode:1.28.3'
 
 // if u use AndroidX, use the following
-implementation 'com.blankj:utilcodex:1.28.2'
+implementation 'com.blankj:utilcodex:1.28.3'
 ```
 
 
diff --git a/lib/utilcode/README.md b/lib/utilcode/README.md
@@ -2,10 +2,10 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.28.2'
+implementation 'com.blankj:utilcode:1.28.3'
 
 // if u use AndroidX, use the following
-implementation 'com.blankj:utilcodex:1.28.2'
+implementation 'com.blankj:utilcodex:1.28.3'
 ```
 
 
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/Utils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/Utils.java
@@ -42,9 +42,20 @@ private Utils() {
      * @param app application
      */
     public static void init(final Application app) {
-        if (sApp != null) return;
+        if (app == null) {
+            Log.e("Utils", "app is null.");
+            return;
+        }
+        if (sApp == null) {
+            sApp = app;
+            UtilsBridge.init(sApp);
+            UtilsBridge.preLoad();
+            return;
+        }
+        if (sApp.equals(app)) return;
+        UtilsBridge.unInit(sApp);
         sApp = app;
-        UtilsBridge.init();
+        UtilsBridge.init(sApp);
     }
 
     /**
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/UtilsActivityLifecycleImpl.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/UtilsActivityLifecycleImpl.java
@@ -40,9 +40,13 @@ final class UtilsActivityLifecycleImpl implements Application.ActivityLifecycleC
     private int     mConfigCount     = 0;
     private boolean mIsBackground    = false;
 
-    void init() {
+    void init(Application app) {
+        app.registerActivityLifecycleCallbacks(this);
+    }
+
+    void unInit(Application app) {
         mActivityList.clear();
-        Utils.getApp().registerActivityLifecycleCallbacks(this);
+        app.unregisterActivityLifecycleCallbacks(this);
     }
 
     Activity getTopActivity() {
diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/UtilsBridge.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/UtilsBridge.java
@@ -35,8 +35,15 @@
  */
 class UtilsBridge {
 
-    static void init() {
-        UtilsActivityLifecycleImpl.INSTANCE.init();
+    static void init(Application app) {
+        UtilsActivityLifecycleImpl.INSTANCE.init(app);
+    }
+
+    static void unInit(Application app) {
+        UtilsActivityLifecycleImpl.INSTANCE.unInit(app);
+    }
+
+    static void preLoad() {
         preLoad(AdaptScreenUtils.getPreLoadRunnable());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	+* `20/04/26` [fix] Utils#init fit tinker. Publish 1.28.3.
`1`	`2`	* `20/04/25` [fix] UriUtils#uri2File Unknown URI. Publish 1.28.2.
`2`	`3`	* `20/04/24` [add] SnackbarUtils support show on the top; UriUtils#uri2InputStream.
`3`	`4`	* `20/04/23` [fix] UriUtils#uri2File not support HW; TransActivity crash below 21.