From bd68b01b4d6a5c5eaee4868c9cd142af4b17f2d8 Mon Sep 17 00:00:00 2001 From: minggo Date: Mon, 24 Feb 2020 16:09:13 +0800 Subject: [PATCH] Android native dpi (#2173) * fix compiling error * android get dpi in C++ --- .../CCCanvasRenderingContext2D-android.cpp | 3 ++- .../platform/android/CCDevice-android.cpp | 6 +++++- .../src/org/cocos2dx/lib/Cocos2dxHelper.java | 19 ------------------- .../app/jni/Application.mk | 2 +- 4 files changed, 8 insertions(+), 22 deletions(-) diff --git a/native/cocos/platform/android/CCCanvasRenderingContext2D-android.cpp b/native/cocos/platform/android/CCCanvasRenderingContext2D-android.cpp index 58ef5e4c35..fedb9d0241 100644 --- a/native/cocos/platform/android/CCCanvasRenderingContext2D-android.cpp +++ b/native/cocos/platform/android/CCCanvasRenderingContext2D-android.cpp @@ -489,7 +489,8 @@ void CanvasRenderingContext2D::set_font(const std::string& font) // if regex rule that does not conform to the rules,such as Chinese,it defaults to sans-serif std::match_results fontResults; std::regex fontRe("([\\w\\s-]+|\"[\\w\\s-]+\"$)"); - if(std::regex_match(results[4].str(), fontResults, fontRe)) + std::string tmp(results[4].str()); + if(std::regex_match(tmp, fontResults, fontRe)) { fontName = results[4].str(); } diff --git a/native/cocos/platform/android/CCDevice-android.cpp b/native/cocos/platform/android/CCDevice-android.cpp index 393cb5ab2c..db926201d4 100644 --- a/native/cocos/platform/android/CCDevice-android.cpp +++ b/native/cocos/platform/android/CCDevice-android.cpp @@ -148,7 +148,11 @@ int Device::getDPI() static int dpi = -1; if (dpi == -1) { - dpi = JniHelper::callStaticIntMethod(JCLS_HELPER, "getDPI"); + AConfiguration* config = AConfiguration_new(); + AConfiguration_fromAssetManager(config, JniHelper::getAndroidApp()->activity->assetManager); + int32_t density = AConfiguration_getDensity(config); + AConfiguration_delete(config); + dpi = density * 160; } return dpi; } diff --git a/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java b/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java index d5418b9400..102a4290ea 100644 --- a/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java +++ b/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java @@ -389,25 +389,6 @@ public class Cocos2dxHelper { android.os.Process.killProcess(android.os.Process.myPid()); } - public static int getDPI() - { - if (sActivity != null) - { - DisplayMetrics metrics = new DisplayMetrics(); - WindowManager wm = sActivity.getWindowManager(); - if (wm != null) - { - Display d = wm.getDefaultDisplay(); - if (d != null) - { - d.getMetrics(metrics); - return (int)(metrics.density*160.0f); - } - } - } - return -1; - } - public static byte[] conversionEncoding(byte[] text, String fromCharset,String newCharset) { try { diff --git a/native/templates/js-template-link/frameworks/runtime-src/proj.android-studio/app/jni/Application.mk b/native/templates/js-template-link/frameworks/runtime-src/proj.android-studio/app/jni/Application.mk index 7b1c631ee5..29713a25ed 100755 --- a/native/templates/js-template-link/frameworks/runtime-src/proj.android-studio/app/jni/Application.mk +++ b/native/templates/js-template-link/frameworks/runtime-src/proj.android-studio/app/jni/Application.mk @@ -3,7 +3,7 @@ APP_STL := c++_static # Uncomment this line to compile to armeabi-v7a, your application will run faster but support less devices APP_ABI := armeabi-v7a -APP_CPPFLAGS := -frtti -std=c++11 -fsigned-char +APP_CPPFLAGS := -frtti -std=c++14 -fsigned-char APP_LDFLAGS := -latomic # To solve windows commands char length too long