修复获取指定的语种下的资源后导致获取系统语种失效的问题

Author: getActivity

MultiLanguages.apk

@@ -1,9 +1,11 @@
-# 国际化适配框架
+# 国际化框架
+
+![](MultiLanguages.gif)
 
 #### 集成步骤
 
     dependencies {
-        implementation 'com.hjq:language:2.0'
+        implementation 'com.hjq:language:3.0'
     }
 
 #### 初始化框架

MultiLanguages.gif

@@ -7,8 +7,8 @@ android {
         applicationId "com.hjq.language.demo"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 20
-        versionName "2.0"
+        versionCode 30
+        versionName "3.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -29,5 +29,5 @@ dependencies {
     // 标题栏：https://github.com/getActivity/TitleBar
     implementation 'com.hjq:titlebar:6.0'
     // 吐司工具类：https://github.com/getActivity/ToastUtils
-    implementation 'com.hjq:toast:6.0'
+    implementation 'com.hjq:toast:8.0'
 }

README.md

@@ -13,4 +13,4 @@ protected void attachBaseContext(Context newBase) {
         // 国际化适配（绑定语种）
         super.attachBaseContext(LanguagesManager.attach(newBase));
     }
-}
+}

app/build.gradle

@@ -17,12 +17,12 @@ public class LanguageActivity extends BaseActivity
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_language);
+
         findViewById(R.id.btn_language_auto).setOnClickListener(this);
         findViewById(R.id.btn_language_cn).setOnClickListener(this);
         findViewById(R.id.btn_language_tw).setOnClickListener(this);
         findViewById(R.id.btn_language_en).setOnClickListener(this);
 
-
         ((TextView) findViewById(R.id.tv_language_system)).setText(LanguagesManager.getLanguageString(this, LanguagesManager.getSystemLanguage(), R.string.current_language));
 
         Locale locale = LanguagesManager.getAppLanguage(this);

app/src/main/java/com/hjq/language/demo/BaseActivity.java

@@ -16,6 +16,7 @@ allprojects {
         jcenter()
         google()
         maven {url "https://jitpack.io"}
+        maven {url 'https://maven.google.com'}
     }
 
     //解决app:mockableAndroidJar错误的问题

app/src/main/java/com/hjq/language/demo/LanguageActivity.java

@@ -5,23 +5,21 @@ apply plugin: 'com.novoda.bintray-release'
 android {
     compileSdkVersion 26
 
-    resourcePrefix "language_"
-
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 26
-        versionCode 20
-        versionName "2.0"
+        versionCode 30
+        versionName "3.0"
     }
 }
 
 publish {
     userOrg = 'getactivity'//填写bintray用户名，注意大小写
     groupId = 'com.hjq'//定义的maven group id最终引用形式
     artifactId = 'language'//maven的artifact id
-    version = '2.0'//maven 上发布版本号
+    version = '3.0'//maven 上发布版本号
     description = 'Android Multi Languages Adaptation Framework'//描述，自己定义
-    website = "https://github.com/getActivity/"//项目在github中的地址
+    website = "https://github.com/getActivity/MultiLanguages"//项目在github中的地址
 }
 
 tasks.withType(Javadoc) {//防止编码问题

build.gradle

@@ -3,6 +3,7 @@
 import android.content.ComponentCallbacks;
 import android.content.Context;
 import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.os.Build;
 
 import java.util.Locale;
@@ -16,7 +17,16 @@
 final class LanguagesChange implements ComponentCallbacks {
 
     /** 系统语种 */
-    private static Locale sSystemLanguage = Locale.getDefault();
+    private static Locale sSystemLanguage;
+
+    static {
+        // 获取当前系统的语种
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            sSystemLanguage = Resources.getSystem().getConfiguration().getLocales().get(0);
+        } else  {
+            sSystemLanguage = Resources.getSystem().getConfiguration().locale;
+        }
+    }
 
     /**
      * 获取系统的语种

library/build.gradle

@@ -95,8 +95,8 @@ public static boolean equalsCountry(Locale locale1, Locale locale2) {
     /**
      * 获取某个语种下的 String
      */
-    public static String getLanguageString(Context context, Locale locale, int stringId) {
-        return getLanguageResources(context, locale).getString(stringId);
+    public static String getLanguageString(Context context, Locale locale, int id) {
+        return getLanguageResources(context, locale).getString(id);
     }
 
     /**