Test_Project_Cocos/cocos-enhance-kit
1
0
Fork 0
mirror of https://github.com/smallmain/cocos-enhance-kit.git synced 2025-10-09 16:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

[engine] [cocos2d-x] [jsb-adapter] 适配引擎 v2.4.10 版本

Browse Source
This commit is contained in:
SmallMain
2022-10-01 17:51:47 +08:00
parent 0740917436
commit e2077e59b5
31 changed files with 200 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cocos2d-x/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java
View File

@@ -46,6 +46,7 @@ import android.os.Build;
import android.os.Environment;
import android.os.ParcelFileDescriptor;
import android.os.Vibrator;
import android.os.LocaleList;
import android.preference.PreferenceManager.OnActivityResultListener;
import android.util.DisplayMetrics;
import android.util.Log;
@@ -304,11 +305,19 @@ public class Cocos2dxHelper {
}
public static String getCurrentLanguage() {
return Locale.getDefault().getLanguage();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
return LocaleList.getDefault().get(0).getLanguage();
} else {
return Locale.getDefault().getLanguage();
}
}
public static String getCurrentLanguageCode() {
return Locale.getDefault().toString();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
return LocaleList.getDefault().get(0).getLanguage();
} else {
return Locale.getDefault().getLanguage();
}
}
public static String getDeviceModel(){