Skip to content

[bugfix] Android Device::getDPI / v3 #20509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 30, 2020
Merged

[bugfix] Android Device::getDPI / v3 #20509

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2042ff4
fix dpi
PatriceJiang Apr 28, 2020
7de614f
merge catch cases
PatriceJiang Apr 30, 2020
70b6787
add log when xdpi != ydpi
PatriceJiang Apr 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,16 @@ public void run() {
}
}

private static int displayMetricsToDPI(DisplayMetrics metrics)
{
if(metrics.xdpi != metrics.ydpi) {
Log.w(Cocos2dxHelper.TAG, "xdpi != ydpi, use (xdpi + ydpi)/2 instead.");
return (int) ((metrics.xdpi + metrics.ydpi) / 2.0);
} else {
return (int)metrics.xdpi;
}
}

public static int getDPI()
{
if (sActivity != null)
Expand All @@ -557,8 +567,15 @@ public static int getDPI()
Display d = wm.getDefaultDisplay();
if (d != null)
{
try {
Method getRealMetrics = d.getClass().getMethod("getRealMetrics", metrics.getClass());
getRealMetrics.invoke(d, metrics);
return displayMetricsToDPI(metrics);
} catch (Exception e) {
e.printStackTrace();
}
d.getMetrics(metrics);
return (int)(metrics.density*160.0f);
return displayMetricsToDPI(metrics);
}
}
}
Expand Down