From 7f68a97cdadc3c80e8ace993db8d454ebb5ac21a Mon Sep 17 00:00:00 2001 From: knox Date: Fri, 26 Jul 2019 16:45:31 +0800 Subject: [PATCH 1/2] improve getCurrentLanguage to android --- native/cocos/platform/android/CCApplication-android.cpp | 2 +- .../android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java | 6 +++++- native/cocos/platform/android/jni/JniImp.cpp | 5 +++++ native/cocos/platform/android/jni/JniImp.h | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/native/cocos/platform/android/CCApplication-android.cpp b/native/cocos/platform/android/CCApplication-android.cpp index 9389321794..2acf876a7b 100644 --- a/native/cocos/platform/android/CCApplication-android.cpp +++ b/native/cocos/platform/android/CCApplication-android.cpp @@ -128,7 +128,7 @@ void Application::setPreferredFramesPerSecond(int fps) std::string Application::getCurrentLanguageCode() const { - std::string language = getCurrentLanguageJNI(); + std::string language = getCurrentLanguageCodeJNI(); return language; } 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 0a31580366..52917c517e 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 @@ -305,7 +305,11 @@ public class Cocos2dxHelper { public static String getCurrentLanguage() { return Locale.getDefault().getLanguage(); } - + + public static String getCurrentLanguageCode() { + return Locale.getDefault().toString(); + } + public static String getDeviceModel(){ return Build.MODEL; } diff --git a/native/cocos/platform/android/jni/JniImp.cpp b/native/cocos/platform/android/jni/JniImp.cpp index 17725a9b73..b35befe6ea 100644 --- a/native/cocos/platform/android/jni/JniImp.cpp +++ b/native/cocos/platform/android/jni/JniImp.cpp @@ -599,6 +599,11 @@ std::string getCurrentLanguageJNI() return JniHelper::callStaticStringMethod(JCLS_HELPER, "getCurrentLanguage"); } +std::string getCurrentLanguageCodeJNI() +{ + return JniHelper::callStaticStringMethod(JCLS_HELPER, "getCurrentLanguageCode"); +} + std::string getSystemVersionJNI() { return JniHelper::callStaticStringMethod(JCLS_HELPER, "getSystemVersion"); diff --git a/native/cocos/platform/android/jni/JniImp.h b/native/cocos/platform/android/jni/JniImp.h index 44739cec12..1de98e3674 100644 --- a/native/cocos/platform/android/jni/JniImp.h +++ b/native/cocos/platform/android/jni/JniImp.h @@ -42,6 +42,7 @@ extern int getDeviceSampleRateJNI(); extern int getDeviceAudioBufferSizeInFramesJNI(); extern std::string getCurrentLanguageJNI(); +extern std::string getCurrentLanguageCodeJNI(); extern std::string getSystemVersionJNI(); extern bool openURLJNI(const std::string& url); extern void copyTextToClipboardJNI(const std::string& text); From 48250287eef54f78feaa636fa6e199967e035e60 Mon Sep 17 00:00:00 2001 From: knox Date: Mon, 29 Jul 2019 09:20:11 +0800 Subject: [PATCH 2/2] refine code --- native/cocos/platform/android/CCApplication-android.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/native/cocos/platform/android/CCApplication-android.cpp b/native/cocos/platform/android/CCApplication-android.cpp index 2acf876a7b..0e27dfa126 100644 --- a/native/cocos/platform/android/CCApplication-android.cpp +++ b/native/cocos/platform/android/CCApplication-android.cpp @@ -128,8 +128,7 @@ void Application::setPreferredFramesPerSecond(int fps) std::string Application::getCurrentLanguageCode() const { - std::string language = getCurrentLanguageCodeJNI(); - return language; + return getCurrentLanguageCodeJNI(); } bool Application::isDisplayStats() {