Fix screenOrientation change

JessYanCoding · Aug 23, 2018 · cd0a84c · cd0a84c
1 parent e16deec
commit cd0a84c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/autosize/src/main/java/me/jessyan/autosize/AutoSize.java b/autosize/src/main/java/me/jessyan/autosize/AutoSize.java
@@ -142,9 +142,12 @@ public static void autoConvertDensityBaseOnHeight(Activity activity, float desig
     public static void autoConvertDensity(Activity activity, float sizeInDp, boolean isBaseOnWidth) {
         Preconditions.checkNotNull(activity, "activity == null");
 
+        int screenSize = isBaseOnWidth ? AutoSizeConfig.getInstance().getScreenWidth()
+                : AutoSizeConfig.getInstance().getScreenHeight();
         String key = sizeInDp + "|" + isBaseOnWidth + "|"
                 + AutoSizeConfig.getInstance().isUseDeviceSize() + "|"
-                + AutoSizeConfig.getInstance().getInitScaledDensity();
+                + AutoSizeConfig.getInstance().getInitScaledDensity() + "|"
+                + screenSize;
 
         DisplayMetricsInfo displayMetricsInfo = mCache.get(key);
 

diff --git a/autosize/src/main/java/me/jessyan/autosize/AutoSizeConfig.java b/autosize/src/main/java/me/jessyan/autosize/AutoSizeConfig.java
@@ -170,10 +170,15 @@ AutoSizeConfig init(final Application application, boolean isBaseOnWidth, AutoAd
         application.registerComponentCallbacks(new ComponentCallbacks() {
             @Override
             public void onConfigurationChanged(Configuration newConfig) {
-                if (newConfig != null && newConfig.fontScale > 0) {
-                    mInitScaledDensity =
-                            Resources.getSystem().getDisplayMetrics().scaledDensity;
-                    LogUtils.d("initScaledDensity = " + mInitScaledDensity + " on ConfigurationChanged");
+                if (newConfig != null) {
+                    if (newConfig.fontScale > 0) {
+                        mInitScaledDensity =
+                                Resources.getSystem().getDisplayMetrics().scaledDensity;
+                        LogUtils.d("initScaledDensity = " + mInitScaledDensity + " on ConfigurationChanged");
+                    }
+                    int[] screenSize = ScreenUtils.getScreenSize(application);
+                    mScreenWidth = screenSize[0];
+                    mScreenHeight = screenSize[1];
                 }
             }