Merge pull request #120 from zhuhongbozhuhongbo/master

将先行卡版本检查由HomeActivity移动到LogoActivity中。

mobile/src/main/java/cn/garymb/ygomobile/ui/activities/LogoActivity.java

@@ -12,6 +12,7 @@ import cn.garymb.ygomobile.AppsSettings;
 import cn.garymb.ygomobile.YGOStarter;
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.ui.home.MainActivity;
+import cn.garymb.ygomobile.utils.ServerUtil;
 
 public class LogoActivity extends Activity {
     Handler handler;
@@ -41,6 +42,7 @@ public class LogoActivity extends Activity {
             handler.postDelayed(runnable, 1000);
             Toast.makeText(LogoActivity.this, R.string.logo_text, Toast.LENGTH_SHORT).show();
         }
+        ServerUtil.initExCardState();//检查扩展卡版本
         if (!isTaskRoot()) {
             finish();
         }

mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java

@@ -105,7 +105,7 @@ public abstract class HomeActivity extends BaseActivity implements BottomNavigat
         //showNewbieGuide("homePage");
         initBottomNavigationBar();
         onNewIntent(getIntent());
-        ServerUtil.initExCardState();//检查扩展卡版本 todo 移动到LogoActivity中
+
     }
 
     @Override

mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeFragment.java

@@ -112,6 +112,10 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene
     private CardView cv_bot_game;
     private CardView cv_watch_replay;
     //辅助功能
+
+    /**
+     * 先行卡下载按钮，点击后跳转到先行卡下载页面
+     */
     private CardView cv_download_ex;
     private LinearLayoutCompat ll_new_notice;
     //外连
@@ -139,7 +143,7 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene
         if (!EventBus.getDefault().isRegistered(this)) {//加上判断
             EventBus.getDefault().register(this);
         }
-        ServerUtil.initExCardState();//HomeActivity中会调用一次本函数，此处再次调用的原因：有时HomeFragment的onCreateView()函数执行较慢，导致initExCardState()中eventbus事件发布完毕后仍未注册，因此在此处再调用一次检查，再次发布
+        ServerUtil.initExCardState();//LogoActivity中会调用一次本函数，此处再次调用的原因：有时HomeFragment的onCreateView()函数执行较慢，导致initExCardState()中eventbus事件发布完毕后仍未注册，因此在此处再调用一次检查，再次发布
         changeColor();
         //showNewbieGuide("homePage");
         return layoutView;
@@ -296,6 +300,9 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene
 
     }
 
+    /**
+     *  根据同服务器状态设置展示列表中每项的颜色（服务器不可用就设置为灰色）
+     */
     private void changeColor() {
         /* 同步设置服务器列表的状态，在syncLoadData()里更新recyclerview的数据，在更新数据时convert()方法自动更改item的颜色 */
         mServerListManager.syncLoadData();

mobile/src/main/java/cn/garymb/ygomobile/ui/settings/SettingFragment.java

@@ -253,7 +253,9 @@ public class SettingFragment extends PreferenceFragmentPlus {
             return rs;
         }
         return true;
-    }    @SuppressLint("HandlerLeak")
+    }
+
+    @SuppressLint("HandlerLeak")
     Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -626,25 +628,30 @@ public class SettingFragment extends PreferenceFragmentPlus {
                     FileUtils.delFile(fonts);
                 IOUtils.copyFilesFromAssets(getContext(), getDatapath(Constants.FONT_DIRECTORY), mSettings.getFontDirPath(), true);
                 //根据系统语言复制特定资料文件
-                String language = getContext().getResources().getConfiguration().locale.getLanguage();
-                if (!language.isEmpty()) {
-                    if (mSettings.getDataLanguage() == -1) {
-                        if (language.equals("zh")) {
+                if (mSettings.getDataLanguage() == -1) {//如果未在App中指定语言，则查询系统语言并进行设置
+                    String language = getContext().getResources().getConfiguration().locale.getLanguage();
+                    if (!language.isEmpty()) {
+                        if (language.equals(AppsSettings.languageEnum.Chinese.name)) {
                             mSettings.copyCnData();
-                        } else if (language.equals("ko")) {
+                        } else if (language.equals(AppsSettings.languageEnum.Korean.name)) {
                             mSettings.copyKorData();
-                        }else if (language.equals("es")) {
+                        } else if (language.equals(AppsSettings.languageEnum.Spanish.name)) {
                             mSettings.copyEsData();
                         } else {
                             mSettings.copyEnData();
                         }
-                    } else {
-                        if (mSettings.getDataLanguage() == AppsSettings.languageEnum.Chinese.code) mSettings.copyCnData();
-                        if (mSettings.getDataLanguage() == AppsSettings.languageEnum.Korean.code) mSettings.copyKorData();
-                        if (mSettings.getDataLanguage() == AppsSettings.languageEnum.English.code) mSettings.copyEnData();
-                        if (mSettings.getDataLanguage() == AppsSettings.languageEnum.Spanish.code) mSettings.copyEsData();
                     }
+                } else {
+                    if (mSettings.getDataLanguage() == AppsSettings.languageEnum.Chinese.code)
+                        mSettings.copyCnData();
+                    if (mSettings.getDataLanguage() == AppsSettings.languageEnum.Korean.code)
+                        mSettings.copyKorData();
+                    if (mSettings.getDataLanguage() == AppsSettings.languageEnum.English.code)
+                        mSettings.copyEnData();
+                    if (mSettings.getDataLanguage() == AppsSettings.languageEnum.Spanish.code)
+                        mSettings.copyEsData();
                 }
+
                 /*
                 IOUtils.copyFilesFromAssets(this, getDatapath(Constants.CORE_SOUND_PATH),
                         mSettings.getSoundPath(), false);*/