bug fixed

app/src/main/java/com/sheep/gamegroup/module/login/LoginAct.java

@@ -76,10 +76,13 @@ public class LoginAct extends BaseUMActivity implements LoginController {
     public void initView() {
         TitleBarUtils.getInstance().setTitleBack(this);
 //        if (DDProviderHelper.getInstance().getAccountList().size() == 0) {
-        WelcomeFgt welcomeFragment = WelcomeFgt.newInstance(this);
-        showFragment("welcome", welcomeFragment);
-        if (getIntent().getStringExtra("where_from") != null)//为空时代表没有登录的情况下直接进入小绵羊
+
+        if (getIntent().getStringExtra("where_from") != null) {//为空时代表没有登录的情况下直接进入小绵羊
             whenToLogin(LoginController.PLATFORM_PHONE);
+        } else {
+            WelcomeFgt welcomeFragment = WelcomeFgt.newInstance(this);
+            showFragment("welcome", welcomeFragment);
+        }
 //        } else {
 //            SignInFgt signInFragment = SignInFgt.newInstance(this);
 //            showFragment("登录", signInFragment);
@@ -97,11 +100,11 @@ public class LoginAct extends BaseUMActivity implements LoginController {
         }
         int stackCount = getSupportFragmentManager().getBackStackEntryCount();
         super.onBackPressed();
-        if (stackCount == 2) {
+        if (stackCount == 2 && getIntent().getStringExtra("where_from") == null) {
             TitleBarUtils.getInstance().setShowOrHide(this, false);
         }
         if (getSupportActionBar() != null) {
-            if (stackCount == 2) {
+            if (stackCount == 2 && getIntent().getStringExtra("where_from") == null) {
                 getSupportActionBar().hide();
             } else {
                 getSupportActionBar().show();
@@ -217,7 +220,11 @@ public class LoginAct extends BaseUMActivity implements LoginController {
                 getSupportActionBar().hide();
             }
         }
-        TitleBarUtils.getInstance().setShowOrHide(this, getSupportFragmentManager().getBackStackEntryCount() > 0).setTitle(this, tag);
+        if (getIntent().getStringExtra("where_from") != null) {
+            TitleBarUtils.getInstance().setShowOrHide(this, true).setTitle(this, tag);
+        } else {
+            TitleBarUtils.getInstance().setShowOrHide(this, getSupportFragmentManager().getBackStackEntryCount() > 0).setTitle(this, tag);
+        }
         FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
         transaction.replace(R.id.fragment_container, fragment, tag);
         transaction.show(fragment);

app/src/main/java/com/sheep/gamegroup/view/customview/CountDownButton.java

@@ -13,7 +13,7 @@ import java.util.Locale;
 
 public class CountDownButton extends AppCompatButton {
 
-    private String freezonText = "发送验证码({0}s)";
+    private String freezonText = "重发({0}s)";
     private String enableText = "发送验证码";
 
     private int cooldown = 60;