Skip to content

Commit 86ba646

Browse files
committed
优化: 对适配信息缓存的 Key 值进行优化
1 parent 75653c8 commit 86ba646

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

autosize/src/main/java/me/jessyan/autosize/AutoSize.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public static void autoConvertDensity(Activity activity, float sizeInDp, boolean
184184
int screenSize = isBaseOnWidth ? AutoSizeConfig.getInstance().getScreenWidth()
185185
: AutoSizeConfig.getInstance().getScreenHeight();
186186

187-
int key = Math.round(sizeInDp + subunitsDesignSize + AutoSizeConfig.getInstance().getInitScaledDensity() + screenSize) & ~MODE_MASK;
187+
int key = Math.round((sizeInDp + subunitsDesignSize + screenSize) * AutoSizeConfig.getInstance().getInitScaledDensity()) & ~MODE_MASK;
188188
key = isBaseOnWidth ? (key | MODE_ON_WIDTH) : (key & ~MODE_ON_WIDTH);
189189
key = AutoSizeConfig.getInstance().isUseDeviceSize() ? (key | MODE_DEVICE_SIZE) : (key & ~MODE_DEVICE_SIZE);
190190

autosize/src/main/java/me/jessyan/autosize/AutoSizeCompat.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public static void autoConvertDensity(Resources resources, float sizeInDp, boole
145145
int screenSize = isBaseOnWidth ? AutoSizeConfig.getInstance().getScreenWidth()
146146
: AutoSizeConfig.getInstance().getScreenHeight();
147147

148-
int key = Math.round(sizeInDp + subunitsDesignSize + AutoSizeConfig.getInstance().getInitScaledDensity() + screenSize) & ~MODE_MASK;
148+
int key = Math.round((sizeInDp + subunitsDesignSize + screenSize) * AutoSizeConfig.getInstance().getInitScaledDensity()) & ~MODE_MASK;
149149
key = isBaseOnWidth ? (key | MODE_ON_WIDTH) : (key & ~MODE_ON_WIDTH);
150150
key = AutoSizeConfig.getInstance().isUseDeviceSize() ? (key | MODE_DEVICE_SIZE) : (key & ~MODE_DEVICE_SIZE);
151151

0 commit comments

Comments
 (0)