bug fixed

app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtGameCenter.java

@@ -86,19 +86,19 @@ public class FgtGameCenter extends BaseFragment {
         backBtn.setVisibility((getActivity() instanceof ActMain) ? View.GONE : View.VISIBLE);
         TitleFragmentListAdapter mAdapter = new TitleFragmentListAdapter(getChildFragmentManager());
         mAdapter.add(new FgtPlayGame(), "玩转游戏");
-//        mAdapter.add(new com.sheep.gamegroup.view.fragment.FgtGiftCenter(), "礼包中心");
-        if (EmulatorDetectUtil.isEmulator()) {
-            mAdapter.add(FgtWeb.newInstance(new WebParams(Config.getUrlByPath(Config.PATH_WELFARE_HOME))), "福利中心");
-        } else {
-            mAdapter.add(FgtWebX5.newInstance(new WebParams(Config.getUrlByPath(Config.PATH_WELFARE_HOME))), "福利中心");
-        }
-        mAdapter.add(FgtFindChild.newInstance(new ArticleTag(-1, 1)), "游戏资讯");
-        if (EmulatorDetectUtil.isEmulator()) {
-            gameMallFgt = FgtWeb.newInstance(new WebParams(Config.getUrlByPath(Config.PATH_GAME_SHOP_HOME)));
-        } else {
-            gameMallFgt = FgtWebX5.newInstance(new WebParams(Config.getUrlByPath(Config.PATH_GAME_SHOP_HOME)));
-        }
-        mAdapter.add(gameMallFgt, "游戏商城");
+        mAdapter.add(new com.sheep.gamegroup.view.fragment.FgtGiftCenter(), "礼包中心");
+//        if (EmulatorDetectUtil.isEmulator()) {
+//            mAdapter.add(FgtWeb.newInstance(new WebParams(Config.getUrlByPath(Config.PATH_WELFARE_HOME))), "福利中心");
+//        } else {
+//            mAdapter.add(FgtWebX5.newInstance(new WebParams(Config.getUrlByPath(Config.PATH_WELFARE_HOME))), "福利中心");
+//        }
+//        mAdapter.add(FgtFindChild.newInstance(new ArticleTag(-1, 1)), "游戏资讯");
+//        if (EmulatorDetectUtil.isEmulator()) {
+//            gameMallFgt = FgtWeb.newInstance(new WebParams(Config.getUrlByPath(Config.PATH_GAME_SHOP_HOME)));
+//        } else {
+//            gameMallFgt = FgtWebX5.newInstance(new WebParams(Config.getUrlByPath(Config.PATH_GAME_SHOP_HOME)));
+//        }
+//        mAdapter.add(gameMallFgt, "游戏商城");
         pager.setAdapter(mAdapter);
         indicator.setupWithViewPager(pager);
         CommonUtil.getInstance().reflex(indicator, getActivity(), false, G.WIDTH - G.getRealPix(144));

app/src/main/java/com/sheep/gamegroup/module/pay/fragment/SetPasswordFragment.java

@@ -46,6 +46,10 @@ public class SetPasswordFragment extends AbsConfirmFragment {
             G.showToast("请输入密码");
             return;
         }
+        if (passwordBox.getText().toString().length() == 6) {
+            G.showToast("密码必须6位");
+            return;
+        }
         if (!passwordBox.getText().toString().equals(passwordBox2.getText().toString())) {
             G.showToast("请再次输入相同密码");
             return;

app/src/main/java/com/sheep/gamegroup/view/activity/ActSetting.java

@@ -36,7 +36,7 @@ import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_CLEAN_SURE;
 public class ActSetting extends BaseActivity {
 
     @BindView(R.id.pay_pwd_flag)
-    View payPwdFlag;
+    TextView payPwdFlag;
     private Activity activity;
 
     @Override
@@ -56,7 +56,7 @@ public class ActSetting extends BaseActivity {
 
     public void onResume() {
         super.onResume();
-        payPwdFlag.setVisibility(DataUtil.getInstance().getUserEntity().hasPayPwd() ? View.VISIBLE : View.GONE);
+        payPwdFlag.setText(DataUtil.getInstance().getUserEntity().hasPayPwd() ? "已设置" : "未设置");
     }
 
     @Override

app/src/main/java/com/sheep/gamegroup/view/activity/SplashAct.java

@@ -184,9 +184,11 @@ public class SplashAct extends BaseActivity {
                     .setOnTickListener(new RxjavaCountDownTimer.OnTickListener() {
                         @Override
                         public void onFinish() {
-                            splash_skip.setVisibility(View.INVISIBLE);//设置为INVISIBLE代表定时器结束
-                            if (!goLink) {
-                                sendHandlerMessages(10);
+                            if(!isDestroyed()) {
+                                splash_skip.setVisibility(View.INVISIBLE);//设置为INVISIBLE代表定时器结束
+                                if (!goLink) {
+                                    sendHandlerMessages(10);
+                                }
                             }
                         }