see 08/07 log

Author: Blankj

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.18.3-brightgreen.svg
+[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.18.4-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.18.3-brightgreen.svg
+[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.18.4-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

app/src/main/java/com/blankj/androidutilcode/feature/core/screen/ScreenAdaptActivity.java

@@ -36,9 +36,9 @@ public static void start(Context context) {
     @Override
     public void initData(@Nullable Bundle bundle) {
         if (ScreenUtils.isPortrait()) {
-            ScreenUtils.adaptScreen4VerticalSlide(this, 360);
+            ScreenUtils.adaptScreen4VerticalSlide(this, 720);
         } else {
-            ScreenUtils.adaptScreen4HorizontalSlide(this, 360);
+            ScreenUtils.adaptScreen4HorizontalSlide(this, 720);
         }
     }
 

config.gradle

@@ -6,8 +6,8 @@ ext {
             compileSdkVersion: 27,
             minSdkVersion    : 14,
             targetSdkVersion : 27,
-            versionCode      : 1_018_003,
-            versionName      : '1.18.3'// E.g 1.9.72 => 1,009,072
+            versionCode      : 1_018_004,
+            versionName      : '1.18.4'// 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.18.3'
+//        implementation 'com.blankj:utilcode:1.18.4'
     }
 }
 

update_log.md

@@ -1,3 +1,4 @@
+* 18/08/07 修复 ScreenUtils#adaptxx 在 API 26 以下无效的 bug，发布 1.18.4
 * 18/08/06 修复 ScreenUtils#screenShot 中 decorView.getDrawingCache() 为空的问题，发布 1.18.3
 * 18/08/05 修复 1.18.0 版本删去 `if (activity.getClass() == PermissionUtils.PermissionActivity.class) return;` 造成 PermissionUtils 获取栈顶 Activity 问题，发布 1.18.2
 * 18/08/04 新增 LogUtils#Config#setSaveDays，发布 1.18.1

utilcode/README-CN.md

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

utilcode/README.md

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

utilcode/src/main/java/com/blankj/utilcode/util/ScreenUtils.java

@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.app.KeyguardManager;
+import android.content.ComponentCallbacks;
 import android.content.Context;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
@@ -13,6 +14,7 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.RequiresPermission;
 import android.util.DisplayMetrics;
+import android.util.Log;
 import android.view.Surface;
 import android.view.View;
 import android.view.Window;
@@ -303,7 +305,7 @@ public static boolean isTablet() {
      *                        the designWidthInDp = 720 / 2.
      */
     public static void adaptScreen4VerticalSlide(final Activity activity,
-                                                 final int designWidthInDp) {
+                                                 final float designWidthInDp) {
         adaptScreen(activity, designWidthInDp, true);
     }
 
@@ -315,7 +317,7 @@ public static void adaptScreen4VerticalSlide(final Activity activity,
      *                         the designHeightInDp = 1080 / 3.
      */
     public static void adaptScreen4HorizontalSlide(final Activity activity,
-                                                   final int designHeightInDp) {
+                                                   final float designHeightInDp) {
         adaptScreen(activity, designHeightInDp, false);
     }
 
@@ -325,27 +327,55 @@ public static void adaptScreen4HorizontalSlide(final Activity activity,
      * @param activity The activity.
      */
     public static void cancelAdaptScreen(final Activity activity) {
-        final DisplayMetrics appDm = Utils.getApp().getResources().getDisplayMetrics();
         final DisplayMetrics activityDm = activity.getResources().getDisplayMetrics();
-        activityDm.density = appDm.density;
-        activityDm.scaledDensity = appDm.scaledDensity;
-        activityDm.densityDpi = appDm.densityDpi;
+        if (UDM.densityDpi != -1) {
+            activityDm.density = UDM.density;
+            activityDm.scaledDensity = UDM.scaledDensity;
+            activityDm.densityDpi = UDM.densityDpi;
+        } else {
+            Log.i("ScreenUtils", "U should adapt screen first.");
+        }
     }
 
+
     /**
      * Reference from: https://mp.weixin.qq.com/s/d9QCoBP6kV9VSWvVldVVwA
      */
     private static void adaptScreen(final Activity activity,
                                     final float sizeInDp,
                                     final boolean isVerticalSlide) {
-        final DisplayMetrics appDm = Utils.getApp().getResources().getDisplayMetrics();
         final DisplayMetrics activityDm = activity.getResources().getDisplayMetrics();
+        if (UDM.densityDpi == -1) {
+            UDM.density = activityDm.density;
+            UDM.scaledDensity = activityDm.scaledDensity;
+            UDM.densityDpi = activityDm.densityDpi;
+            Utils.getApp().registerComponentCallbacks(new ComponentCallbacks() {
+                @Override
+                public void onConfigurationChanged(Configuration newConfig) {
+                    if (newConfig != null && newConfig.fontScale > 0) {
+                        UDM.scaledDensity =
+                                Utils.getApp().getResources().getDisplayMetrics().scaledDensity;
+                    }
+                }
+
+                @Override
+                public void onLowMemory() {/**/}
+            });
+        }
         if (isVerticalSlide) {
             activityDm.density = activityDm.widthPixels / sizeInDp;
         } else {
             activityDm.density = activityDm.heightPixels / sizeInDp;
         }
-        activityDm.scaledDensity = activityDm.density * (appDm.scaledDensity / appDm.density);
+        activityDm.scaledDensity = activityDm.density * (UDM.scaledDensity / UDM.density);
         activityDm.densityDpi = (int) (160 * activityDm.density);
     }
+
+    private static final UtilDisplayMetrics UDM = new UtilDisplayMetrics();
+
+    private static class UtilDisplayMetrics {
+        float density;
+        float scaledDensity;
+        int densityDpi = -1;
+    }
 }