liuzhenxing1118 8 月之前
父节点
当前提交
d1ce3e6725
共有 1 个文件被更改,包括 6 次插入1 次删除
  1. 6 1
      app/src/main/java/com/xplora/xponboarding/Activity/OnboardingActivity.java

+ 6 - 1
app/src/main/java/com/xplora/xponboarding/Activity/OnboardingActivity.java

@@ -56,13 +56,18 @@ public class OnboardingActivity extends BaseActivatedActivity {
         String currentLanguage = DataManager.getCurrentLanguage();
 
         for (String s : mLanguageList) {
-            boolean isOn = s.trim().equals(currentLanguage.trim());
             Locale locale = ResUtils.getLocaleName(s);
             String name = LocaleHelper.getDisplayName(locale, locale, true);
             int endIndex = name.indexOf("(");
             if (endIndex >= 0) {
                 name = name.substring(0, endIndex);
             }
+
+            //-, _ 不同,影响判断
+            String s1 = s.replace("-", "").replace("_", "").trim();
+            String c1 = currentLanguage.replace("-", "").replace("_", "").trim();
+            boolean isOn = s1.equals(c1);
+
             BaseModel model = new BaseModel();
             model.title = name;
             model.isOn = isOn;