GithubStar/QMUI_Android
1
0
Fork 0
mirror of https://github.com/Tencent/QMUI_Android.git synced 2026-10-27 02:23:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: getRealScreenSize 去掉 cache 防止折叠屏切换屏幕时无法更新宽高信息

Browse Source
This commit is contained in:
chanthuang
2019-05-20 15:41:00 +08:00
parent 00dc38c3ee
commit bea4241b36
1 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qmui/src/main/java/com/qmuiteam/qmui/util/QMUIDisplayHelper.java
+31 -29
View File
@@ -61,8 +61,8 @@ public class QMUIDisplayHelper {
*/
private static Boolean sHasCamera = null;
private static int[] sPortraitRealSizeCache = null;
private static int[] sLandscapeRealSizeCache = null;
// private static int[] sPortraitRealSizeCache = null;
// private static int[] sLandscapeRealSizeCache = null;
/**
* 获取 DisplayMetrics
@@ -131,33 +131,35 @@ public class QMUIDisplayHelper {
*/
public static int[] getRealScreenSize(Context context) {
if (QMUIDeviceHelper.isEssentialPhone() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
// Essential Phone 8.0版本后，Display size 会根据挖孔屏的设置而得到不同的结果，不能信任 cache
return doGetRealScreenSize(context);
}
int orientation = context.getResources().getConfiguration().orientation;
int[] result;
if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
result = sLandscapeRealSizeCache;
if (result == null) {
result = doGetRealScreenSize(context);
if(result[0] > result[1]){
// the result may be wrong sometimes, do not cache !!!!
sLandscapeRealSizeCache = result;
}
}
return result;
} else {
result = sPortraitRealSizeCache;
if (result == null) {
result = doGetRealScreenSize(context);
if(result[0] < result[1]){
// the result may be wrong sometimes, do not cache !!!!
sPortraitRealSizeCache = result;
}
}
return result;
}
// 切换屏幕导致宽高变化时不能用 cache，先去掉 cache
return doGetRealScreenSize(context);
// if (QMUIDeviceHelper.isEssentialPhone() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
// // Essential Phone 8.0版本后，Display size 会根据挖孔屏的设置而得到不同的结果，不能信任 cache
// return doGetRealScreenSize(context);
// }
// int orientation = context.getResources().getConfiguration().orientation;
// int[] result;
// if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
// result = sLandscapeRealSizeCache;
// if (result == null) {
// result = doGetRealScreenSize(context);
// if(result[0] > result[1]){
// // the result may be wrong sometimes, do not cache !!!!
// sLandscapeRealSizeCache = result;
// }
// }
// return result;
// } else {
// result = sPortraitRealSizeCache;
// if (result == null) {
// result = doGetRealScreenSize(context);
// if(result[0] < result[1]){
// // the result may be wrong sometimes, do not cache !!!!
// sPortraitRealSizeCache = result;
// }
// }
// return result;
// }
}
private static int[] doGetRealScreenSize(Context context) {