登录流程修改

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

@@ -60,6 +60,8 @@ public class LoginAct extends BaseUMActivity implements LoginController {
 //        if (DDProviderHelper.getInstance().getAccountList().size() == 0) {
         WelcomeFgt welcomeFragment = WelcomeFgt.newInstance(this);
         showFragment("welcome", welcomeFragment);
+        if(getIntent().getStringExtra("where_from") != null)//为空时代表没有登录的情况下直接进入小绵羊
+            whenToLogin(LoginController.PLATFORM_PHONE);
 //        } else {
 //            SignInFgt signInFragment = SignInFgt.newInstance(this);
 //            showFragment("登录", signInFragment);

app/src/main/java/com/sheep/gamegroup/module/login/fragments/WelcomeFgt.java

@@ -54,16 +54,14 @@ public class WelcomeFgt extends AbsLoginFgt {
     public void onViewCreated() {
         TestUtil.testChange(getActivity(), testChange);
         TestUtil.testChangeUser(getActivity(), testChangeUser);
-        loginToggleIconBtn.setImageResource(R.mipmap.login_phone);
-        loginToggleTextBtn.setText("一键登录");
     }
 
     @OnClick({R.id.login_btn, R.id.login_type_toggle})
     public void doToLogin(View v) {
         if(v.getId()==R.id.login_btn) {
-            mController.whenToLogin(LoginController.PLATFORM_ACCOUNT);
-        } else {
             mController.whenToLogin(LoginController.PLATFORM_PHONE);
+        } else {
+            mController.whenToLogin(LoginController.PLATFORM_ACCOUNT);
         }
     }
 

app/src/main/res/layout/fragment_login_welcome.xml

@@ -1,5 +1,4 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"