see 08/25 log

Blankj · Blankj · commit d049f20bbe71 · 2018-08-25T00:51:06.000+08:00
diff --git a/README-CN.md b/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.19.1-brightgreen.svg
+[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.19.2-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg
diff --git a/README.md b/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.19.1-brightgreen.svg
+[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.19.2-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg
diff --git a/app/src/main/java/com/blankj/androidutilcode/UtilsApp.java b/app/src/main/java/com/blankj/androidutilcode/UtilsApp.java
@@ -36,9 +36,7 @@ protected void attachBaseContext(Context base) {
     @Override
     public void onCreate() {
         super.onCreate();
-        LogUtils.e();
         sInstance = this;
-        com.blankj.subutil.util.Utils.init(this);
         initLeakCanary();
         initLog();
         initCrash();
diff --git a/config.gradle b/config.gradle
@@ -6,8 +6,8 @@ ext {
             compileSdkVersion: 27,
             minSdkVersion    : 14,
             targetSdkVersion : 27,
-            versionCode      : 1_019_001,
-            versionName      : '1.19.1'// E.g 1.9.72 => 1,009,072
+            versionCode      : 1_019_002,
+            versionName      : '1.19.2'// E.g 1.9.72 => 1,009,072
     ]
 
     versionConfig = [
@@ -167,7 +167,7 @@ def configAppDependencies(Project pro) {
         // LeakCanary
         debugImplementation depConfig.leakcanary.android
         releaseImplementation depConfig.leakcanary.android_no_op
-//        implementation 'com.blankj:utilcode:1.19.1'
+//        implementation 'com.blankj:utilcode:1.19.2'
     }
 }
 
diff --git a/subutil/src/main/AndroidManifest.xml b/subutil/src/main/AndroidManifest.xml
@@ -1 +1,11 @@
-<manifest package="com.blankj.subutil" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.blankj.subutil">
+
+    <application>
+        <provider
+            android:name=".util.Utils$ContentProvider4SubUtil"
+            android:authorities="${applicationId}.subutil.content.provider"
+            android:exported="false"
+            android:multiprocess="true" />
+    </application>
+</manifest>
diff --git a/subutil/src/main/java/com/blankj/subutil/util/Utils.java b/subutil/src/main/java/com/blankj/subutil/util/Utils.java
@@ -2,8 +2,14 @@
 
 import android.annotation.SuppressLint;
 import android.app.Application;
+import android.content.ContentProvider;
+import android.content.ContentValues;
 import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.content.FileProvider;
 
 import java.lang.reflect.InvocationTargetException;
 
@@ -97,4 +103,42 @@ private static Application getApplicationByReflect() {
         }
         throw new NullPointerException("u should init first");
     }
+
+
+    public static final class ContentProvider4SubUtil extends ContentProvider {
+
+        @Override
+        public boolean onCreate() {
+            Utils.init(getContext());
+            return true;
+        }
+
+        @Nullable
+        @Override
+        public Cursor query(@NonNull Uri uri, @Nullable String[] projection, @Nullable String selection, @Nullable String[] selectionArgs, @Nullable String sortOrder) {
+            return null;
+        }
+
+        @Nullable
+        @Override
+        public String getType(@NonNull Uri uri) {
+            return null;
+        }
+
+        @Nullable
+        @Override
+        public Uri insert(@NonNull Uri uri, @Nullable ContentValues values) {
+            return null;
+        }
+
+        @Override
+        public int delete(@NonNull Uri uri, @Nullable String selection, @Nullable String[] selectionArgs) {
+            return 0;
+        }
+
+        @Override
+        public int update(@NonNull Uri uri, @Nullable ContentValues values, @Nullable String selection, @Nullable String[] selectionArgs) {
+            return 0;
+        }
+    }
 }
diff --git a/update_log.md b/update_log.md
@@ -1,3 +1,4 @@
+* 18/08/24 新增 ScreenUtils#restoreAdaptScreen，利用 FileProvider4UtilCode 不再需要初始化，发布 1.19.2
 * 18/08/23 修复适配后 ToastUtils 原生 Toast 尺寸发生改变的问题，修复 KeyboardUtils#fixSoftInputLeaks，发布 1.19.1
 * 18/08/10 修复 ScreenUtils#adaptxx 导致获取状态栏和导航栏尺寸不对问题，发布 1.19.0
 * 18/08/09 新增 IntentUtils#isIntentAvailable，ToastUtils 传入空显示 null，发布 1.18.6
diff --git a/utilcode/README-CN.md b/utilcode/README-CN.md
@@ -2,23 +2,10 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.19.1'
+implementation 'com.blankj:utilcode:1.19.2'
 ```
 
 
-## How to use
-
-```java
-// init it in the function of onCreate in ur Application
-Utils.init(application);
-```
-
-
-## Proguard
-
-U needn't do anything, because I add `consumerProguardFiles 'proguard-rules.pro'` in build.gradle.
-
-
 ## APIs
 
 * ### Activity 相关 -> [ActivityUtils.java][activity.java] -> [Demo][activity.demo]
@@ -543,6 +530,7 @@ isTablet                   : 判断是否是平板
 adaptScreen4VerticalSlide  : 适配垂直滑动的屏幕
 adaptScreen4HorizontalSlide: 适配水平滑动的屏幕
 cancelAdaptScreen          : 取消适配屏幕
+restoreAdaptScreen         : 恢复适配屏幕
 isAdaptScreen              : 是否适配屏幕
 ```
 
diff --git a/utilcode/README.md b/utilcode/README.md
@@ -2,23 +2,10 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.19.1'
+implementation 'com.blankj:utilcode:1.19.2'
 ```
 
 
-## How to use
-
-```java
-// init it in the function of onCreate in ur Application
-Utils.init(application);
-```
-
-
-## Proguard
-
-U needn't do anything, because I add `consumerProguardFiles 'proguard-rules.pro'` in build.gradle.
-
-
 ## APIs
 
 * ### About Activity -> [ActivityUtils.java][activity.java] -> [Demo][activity.demo]
@@ -543,6 +530,7 @@ isTablet
 adaptScreen4VerticalSlide
 adaptScreen4HorizontalSlide
 cancelAdaptScreen
+restoreAdaptScreen
 isAdaptScreen
 ```
 
diff --git a/utilcode/src/main/AndroidManifest.xml b/utilcode/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
             android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
 
         <provider
-            android:name=".util.Utils$FileProvider4Util"
+            android:name=".util.Utils$FileProvider4UtilCode"
             android:authorities="${applicationId}.utilcode.provider"
             android:exported="false"
             android:grantUriPermissions="true"
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/ScreenUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/ScreenUtils.java
@@ -360,6 +360,22 @@ public static void cancelAdaptScreen(final Activity activity) {
         appDm.densityDpi = systemDm.densityDpi;
     }
 
+    /**
+     * Cancel adapt the screen.
+     */
+    public static void cancelAdaptScreen() {
+        Utils.cancelAdaptScreen();
+    }
+
+    /**
+     * Restore adapt the screen.
+     * <p>U should call the method of {@link ScreenUtils#adaptScreen4VerticalSlide(Activity, int)}
+     * or {@link ScreenUtils#adaptScreen4HorizontalSlide(Activity, int)} firstly.</p>
+     */
+    public static void restoreAdaptScreen() {
+        Utils.restoreAdaptScreen();
+    }
+
     /**
      * Return whether adapt screen.
      *
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/ToastUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/ToastUtils.java
@@ -240,7 +240,7 @@ public void run() {
                 if (Utils.isAdaptScreen()) {
                     Utils.cancelAdaptScreen();
                     sToast = Toast.makeText(Utils.getApp(), text, duration);
-                    Utils.adaptScreen();
+                    Utils.restoreAdaptScreen();
                 } else {
                     sToast = Toast.makeText(Utils.getApp(), text, duration);
                 }
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/Utils.java b/utilcode/src/main/java/com/blankj/utilcode/util/Utils.java
@@ -9,6 +9,7 @@
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v4.content.FileProvider;
 import android.util.DisplayMetrics;
 
@@ -87,20 +88,21 @@ public static void init(final Application app) {
      */
     public static Application getApp() {
         if (sApplication != null) return sApplication;
-        return getApplicationByReflect();
+        Application app = getApplicationByReflect();
+        init(app);
+        return app;
     }
 
     private static Application getApplicationByReflect() {
         try {
             @SuppressLint("PrivateApi")
             Class<?> activityThread = Class.forName("android.app.ActivityThread");
-            Object at = activityThread.getMethod("currentActivityThread").invoke(null);
-            Object app = activityThread.getMethod("getApplication").invoke(at);
+            Object thread = activityThread.getMethod("currentActivityThread").invoke(null);
+            Object app = activityThread.getMethod("getApplication").invoke(thread);
             if (app == null) {
                 throw new NullPointerException("u should init first");
             }
-            init((Application) app);
-            return sApplication;
+            return (Application) app;
         } catch (NoSuchMethodException e) {
             e.printStackTrace();
         } catch (IllegalAccessException e) {
@@ -144,21 +146,46 @@ static boolean isAppForeground() {
         return false;
     }
 
-    static void adaptScreen() {
+    static final AdaptScreenArgs ADAPT_SCREEN_ARGS = new AdaptScreenArgs();
+
+    static void restoreAdaptScreen() {
         final DisplayMetrics systemDm = Resources.getSystem().getDisplayMetrics();
         final DisplayMetrics appDm = Utils.getApp().getResources().getDisplayMetrics();
-        if (ADAPT_SCREEN_ARGS.isVerticalSlide) {
-            appDm.density = appDm.widthPixels / (float) ADAPT_SCREEN_ARGS.sizeInPx;
+        final Activity activity = ACTIVITY_LIFECYCLE.getTopActivity();
+        if (activity != null) {
+            final DisplayMetrics activityDm = activity.getResources().getDisplayMetrics();
+            if (ADAPT_SCREEN_ARGS.isVerticalSlide) {
+                activityDm.density = activityDm.widthPixels / (float) ADAPT_SCREEN_ARGS.sizeInPx;
+            } else {
+                activityDm.density = activityDm.heightPixels / (float) ADAPT_SCREEN_ARGS.sizeInPx;
+            }
+            activityDm.scaledDensity = activityDm.density * (systemDm.scaledDensity / systemDm.density);
+            activityDm.densityDpi = (int) (160 * activityDm.density);
+
+            appDm.density = activityDm.density;
+            appDm.scaledDensity = activityDm.scaledDensity;
+            appDm.densityDpi = activityDm.densityDpi;
         } else {
-            appDm.density = appDm.heightPixels / (float) ADAPT_SCREEN_ARGS.sizeInPx;
+            if (ADAPT_SCREEN_ARGS.isVerticalSlide) {
+                appDm.density = appDm.widthPixels / (float) ADAPT_SCREEN_ARGS.sizeInPx;
+            } else {
+                appDm.density = appDm.heightPixels / (float) ADAPT_SCREEN_ARGS.sizeInPx;
+            }
+            appDm.scaledDensity = appDm.density * (systemDm.scaledDensity / systemDm.density);
+            appDm.densityDpi = (int) (160 * appDm.density);
         }
-        appDm.scaledDensity = appDm.density * (systemDm.scaledDensity / systemDm.density);
-        appDm.densityDpi = (int) (160 * appDm.density);
     }
 
     static void cancelAdaptScreen() {
         final DisplayMetrics systemDm = Resources.getSystem().getDisplayMetrics();
         final DisplayMetrics appDm = Utils.getApp().getResources().getDisplayMetrics();
+        final Activity activity = ACTIVITY_LIFECYCLE.getTopActivity();
+        if (activity != null) {
+            final DisplayMetrics activityDm = activity.getResources().getDisplayMetrics();
+            activityDm.density = systemDm.density;
+            activityDm.scaledDensity = systemDm.scaledDensity;
+            activityDm.densityDpi = systemDm.densityDpi;
+        }
         appDm.density = systemDm.density;
         appDm.scaledDensity = systemDm.scaledDensity;
         appDm.densityDpi = systemDm.densityDpi;
@@ -170,8 +197,6 @@ static boolean isAdaptScreen() {
         return systemDm.density != appDm.density;
     }
 
-    static final AdaptScreenArgs ADAPT_SCREEN_ARGS = new AdaptScreenArgs();
-
     static class AdaptScreenArgs {
         int     sizeInPx;
         boolean isVerticalSlide;
@@ -270,7 +295,14 @@ Activity getTopActivity() {
                     return topActivity;
                 }
             }
-            // using reflect to get top activity
+            Activity topActivityByReflect = getTopActivityByReflect();
+            if (topActivityByReflect != null) {
+                setTopActivity(topActivityByReflect);
+            }
+            return topActivityByReflect;
+        }
+
+        private Activity getTopActivityByReflect() {
             try {
                 @SuppressLint("PrivateApi")
                 Class<?> activityThreadClass = Class.forName("android.app.ActivityThread");
@@ -286,9 +318,7 @@ Activity getTopActivity() {
                     if (!pausedField.getBoolean(activityRecord)) {
                         Field activityField = activityRecordClass.getDeclaredField("activity");
                         activityField.setAccessible(true);
-                        Activity activity = (Activity) activityField.get(activityRecord);
-                        setTopActivity(activity);
-                        return activity;
+                        return (Activity) activityField.get(activityRecord);
                     }
                 }
             } catch (ClassNotFoundException e) {
@@ -307,7 +337,7 @@ Activity getTopActivity() {
     }
 
 
-    public static final class FileProvider4Util extends FileProvider {
+    public static final class FileProvider4UtilCode extends FileProvider {
 
         @Override
         public boolean onCreate() {

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ ext {`
`6`	`6`	`compileSdkVersion: 27,`
`7`	`7`	`minSdkVersion : 14,`
`8`	`8`	`targetSdkVersion : 27,`
`9`		`- versionCode : 1_019_001,`
`10`		`- versionName : '1.19.1'// E.g 1.9.72 => 1,009,072`
	`9`	`+ versionCode : 1_019_002,`
	`10`	`+ versionName : '1.19.2'// E.g 1.9.72 => 1,009,072`
`11`	`11`	`]`
`12`	`12`
`13`	`13`	`versionConfig = [`
`@@ -167,7 +167,7 @@ def configAppDependencies(Project pro) {`
`167`	`167`	`// LeakCanary`
`168`	`168`	`debugImplementation depConfig.leakcanary.android`
`169`	`169`	`releaseImplementation depConfig.leakcanary.android_no_op`
`170`		`-// implementation 'com.blankj:utilcode:1.19.1'`
	`170`	`+// implementation 'com.blankj:utilcode:1.19.2'`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+* 18/08/24 新增 ScreenUtils#restoreAdaptScreen，利用 FileProvider4UtilCode 不再需要初始化，发布 1.19.2`
`1`	`2`	`* 18/08/23 修复适配后 ToastUtils 原生 Toast 尺寸发生改变的问题，修复 KeyboardUtils#fixSoftInputLeaks，发布 1.19.1`
`2`	`3`	`* 18/08/10 修复 ScreenUtils#adaptxx 导致获取状态栏和导航栏尺寸不对问题，发布 1.19.0`
`3`	`4`	`* 18/08/09 新增 IntentUtils#isIntentAvailable，ToastUtils 传入空显示 null，发布 1.18.6`