[修改]登录注册界面改版

app/build.gradle

@@ -26,7 +26,7 @@ android {
         }
     }
     greendao {
-        schemaVersion 20
+        schemaVersion 21
         targetGenDir 'src/main/java'
     }
     signingConfigs {

app/src/main/AndroidManifest.xml

@@ -932,8 +932,7 @@
         <activity
                 android:name="com.sheep.gamegroup.module.login.LoginAct"
                 android:launchMode="singleTask"
-                android:screenOrientation="portrait"
-                android:theme="@style/AppActionTheme"/>
+                android:screenOrientation="portrait"/>
         <activity
                 android:name="com.sheep.gamegroup.module.login.ChangePasswordAct"
                 android:screenOrientation="portrait"

app/src/main/java/com/sheep/gamegroup/greendao/DDProviderHelper.java

@@ -24,7 +24,9 @@ import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.DownloadUtil;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.service.AutoCheckService;
+
 import java.util.List;
+
 import rx.functions.Action1;
 
 /**
@@ -522,6 +524,27 @@ public class DDProviderHelper {
         }
     }
 
+    public void saveAccount(Account account, int platform) {
+        Account acc = getAccount(account.getAid());
+        if (acc == null) {
+            getDaossion().getAccountDao().insert(account);
+        } else {
+            if (!TextUtils.isEmpty(account.getLoginname())) {
+                acc.setLoginname(account.getLoginname());
+            }
+            if (!TextUtils.isEmpty(account.getNickname())) {
+                acc.setNickname(account.getNickname());
+            }
+            if (!TextUtils.isEmpty(account.getAvatar())) {
+                acc.setAvatar(account.getAvatar());
+            }
+            acc.setPlatform(platform);
+
+            getDaossion().getAccountDao().update(acc);
+        }
+    }
+
+
     public void deleteAccount(Account account) {
         getDaossion().getAccountDao().delete(account);
     }

app/src/main/java/com/sheep/gamegroup/greendao/download/Account.java

@@ -22,15 +22,18 @@ public class Account {
     private String avatar;
     @Property(nameInDb = "gender")
     private int gender;
-    @Generated(hash = 579786552)
+    @Property(nameInDb = "platform")
+    private int platform;
+    @Generated(hash = 1127398716)
     public Account(Long id, String loginname, String aid, String nickname,
-            String avatar, int gender) {
+            String avatar, int gender, int platform) {
         this.id = id;
         this.loginname = loginname;
         this.aid = aid;
         this.nickname = nickname;
         this.avatar = avatar;
         this.gender = gender;
+        this.platform = platform;
     }
     @Generated(hash = 882125521)
     public Account() {
@@ -83,5 +86,12 @@ public class Account {
         account.setGender(user.getGender());
         return account;
     }
+    public int getPlatform() {
+        return this.platform;
+    }
+    public void setPlatform(int platform) {
+        this.platform = platform;
+    }
+    
 
 }

app/src/main/java/com/sheep/gamegroup/greendao/download/AccountDao.java

@@ -28,6 +28,7 @@ public class AccountDao extends AbstractDao<Account, Long> {
         public final static Property Nickname = new Property(3, String.class, "nickname", false, "nickname");
         public final static Property Avatar = new Property(4, String.class, "avatar", false, "avatar");
         public final static Property Gender = new Property(5, int.class, "gender", false, "gender");
+        public final static Property Platform = new Property(6, int.class, "platform", false, "platform");
     }
 
 
@@ -48,7 +49,8 @@ public class AccountDao extends AbstractDao<Account, Long> {
                 "\"aid\" TEXT," + // 2: aid
                 "\"nickname\" TEXT," + // 3: nickname
                 "\"avatar\" TEXT," + // 4: avatar
-                "\"gender\" INTEGER NOT NULL );"); // 5: gender
+                "\"gender\" INTEGER NOT NULL ," + // 5: gender
+                "\"platform\" INTEGER NOT NULL );"); // 6: platform
     }
 
     /** Drops the underlying database table. */
@@ -86,6 +88,7 @@ public class AccountDao extends AbstractDao<Account, Long> {
             stmt.bindString(5, avatar);
         }
         stmt.bindLong(6, entity.getGender());
+        stmt.bindLong(7, entity.getPlatform());
     }
 
     @Override
@@ -117,6 +120,7 @@ public class AccountDao extends AbstractDao<Account, Long> {
             stmt.bindString(5, avatar);
         }
         stmt.bindLong(6, entity.getGender());
+        stmt.bindLong(7, entity.getPlatform());
     }
 
     @Override
@@ -132,7 +136,8 @@ public class AccountDao extends AbstractDao<Account, Long> {
             cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // aid
             cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // nickname
             cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // avatar
-            cursor.getInt(offset + 5) // gender
+            cursor.getInt(offset + 5), // gender
+            cursor.getInt(offset + 6) // platform
         );
         return entity;
     }
@@ -145,6 +150,7 @@ public class AccountDao extends AbstractDao<Account, Long> {
         entity.setNickname(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3));
         entity.setAvatar(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4));
         entity.setGender(cursor.getInt(offset + 5));
+        entity.setPlatform(cursor.getInt(offset + 6));
      }
     
     @Override

app/src/main/java/com/sheep/gamegroup/greendao/download/DaoMaster.java

@@ -14,10 +14,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType;
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 /**
- * Master of DAO (schema version 20): knows all DAOs.
+ * Master of DAO (schema version 21): knows all DAOs.
  */
 public class DaoMaster extends AbstractDaoMaster {
-    public static final int SCHEMA_VERSION = 20;
+    public static final int SCHEMA_VERSION = 21;
 
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {

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

@@ -100,7 +100,7 @@ public class LoginAct extends BaseUMActivity implements LoginController {
 
     @Override
     public void initView() {
-        TitleBarUtils.getInstance().setTitleBack(this);
+        //TitleBarUtils.getInstance().setTitleBack(this);
 //        if (DDProviderHelper.getInstance().getAccountList().size() == 0) {
 
         if (getIntent().getStringExtra("where_from") != null) {//为空时代表没有登录的情况下直接进入小绵羊
@@ -162,7 +162,7 @@ public class LoginAct extends BaseUMActivity implements LoginController {
         }
         TestUtil.saveUser(loginResult);
         if (platform == LoginController.PLATFORM_ACCOUNT || platform == LoginController.PLATFORM_PHONE) {
-            DDProviderHelper.getInstance().saveAccount(Account.generateByUser(loginResult.getUser()));
+            DDProviderHelper.getInstance().saveAccount(Account.generateByUser(loginResult.getUser()),platform);
         }
         //登录成功记录设备信息
         ApiJSONUtil.postUserDeviceLog();

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

@@ -16,10 +16,7 @@ import android.util.Base64;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.PopupWindow;
-import android.widget.TextView;
+import android.widget.*;
 
 import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.greendao.DDProviderHelper;
@@ -55,7 +52,7 @@ public class SignInFgt extends AbsLoginFgt {
 
     private int loginType = LoginController.PLATFORM_PHONE;
 
-    @BindView(R.id.for_account_pwd_container)
+    @BindView(R.id.cl_account_login)
     View forAccountPwdContainer;
     @BindView(R.id.for_phone_container)
     View forPhoneContainer;
@@ -85,6 +82,8 @@ public class SignInFgt extends AbsLoginFgt {
     ImageView verifyImageView;
     @BindView(R.id.captcha_seperator)
     View verifySeperator;
+    @BindView(R.id.cb_remember_pwd)
+    CheckBox cbRememberPwd;
 
     private String captchaId;
 
@@ -114,14 +113,14 @@ public class SignInFgt extends AbsLoginFgt {
             forAccountPwdContainer.setVisibility(View.GONE);
             forPhoneContainer.setVisibility(View.VISIBLE);
             loginTypeToggle.setSelected(true);
-            loginTypeToggleIcon.setImageResource(R.mipmap.login_account);
-            loginTypeToggleText.setText("账号登录");
+            loginTypeToggleIcon.setImageResource(R.drawable.zhanghao);
+            loginTypeToggleText.setText("账号");
         } else {
             forAccountPwdContainer.setVisibility(View.VISIBLE);
             forPhoneContainer.setVisibility(View.GONE);
             loginTypeToggle.setSelected(false);
-            loginTypeToggleIcon.setImageResource(R.mipmap.login_phone);
-            loginTypeToggleText.setText("一键登录");
+            loginTypeToggleIcon.setImageResource(R.drawable.shouji);
+            loginTypeToggleText.setText("手机号");
         }
 
         InputFilterUtil.filterPhone86(phoneNumberBox);
@@ -207,7 +206,7 @@ public class SignInFgt extends AbsLoginFgt {
                                 SpUtils.saveToken(getActivity(), loginEty.getToken());
                                 DataUtil.getInstance().initUserEntity(loginEty.getUser());
                             }
-                            if (passwordBox != null) {
+                            if (passwordBox != null && cbRememberPwd.isChecked()) {
                                 SpUtils.saveUp(getContext(), loginEty.getUser().getId(), passwordBox.getText().toString().trim());
                             } else {
                                 SpUtils.saveUp(getContext(), loginEty.getUser().getId(), "");
@@ -344,8 +343,8 @@ public class SignInFgt extends AbsLoginFgt {
 
     public void doToggleLoginType(boolean flag) {
         loginTypeToggle.setSelected(flag);
-        loginTypeToggleText.setText(flag ? "账号登录" : "一键登录");
-        loginTypeToggleIcon.setImageResource(flag ? R.mipmap.login_account : R.mipmap.login_phone);
+        loginTypeToggleText.setText(flag ? "账号" : "手机号");
+        loginTypeToggleIcon.setImageResource(flag ? R.drawable.zhanghao : R.drawable.shouji);
         forPhoneContainer.setVisibility(flag ? View.VISIBLE : View.GONE);
         forAccountPwdContainer.setVisibility(!flag ? View.VISIBLE : View.GONE);
     }
@@ -400,8 +399,8 @@ public class SignInFgt extends AbsLoginFgt {
                     DDProviderHelper.getInstance().deleteAccount(account);
                 });
                 viewHolder.itemView.setOnClickListener(v -> {
-                    String pwd = SpUtils.getUp(getContext(), account.getAid());
-                    if (TextUtils.isEmpty(pwd)) {
+                    //String pwd = SpUtils.getUp(getContext(), account.getAid());
+                    if (account.getPlatform() == LoginController.PLATFORM_PHONE) {
                         phoneNumberBox.setText(account.getLoginname());
                         doToggleLoginType(true);
                     } else {

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

@@ -11,7 +11,6 @@ import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
-
 import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.LoginEntity;
@@ -29,7 +28,6 @@ import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-
 import butterknife.BindView;
 import butterknife.OnClick;
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -38,7 +36,7 @@ import io.reactivex.schedulers.Schedulers;
 /**
  * A simple {@link Fragment} subclass.
  */
-public class SignUpFgt extends BaseFragment {
+public class SignUpFgt extends AbsLoginFgt {
 
     private LoginController mController;
 
@@ -60,10 +58,13 @@ public class SignUpFgt extends BaseFragment {
     EditText passwordBox2;
     @BindView(R.id.show_hide_pwd_btn2)
     ImageView showHidePwdBtn2;
-    @BindView(R.id.register_type_toggle_icon)
+    @BindView(R.id.login_type_toggle_icon)
     ImageView registerToggleIcon;
-    @BindView(R.id.register_type_toggle_text)
+    @BindView(R.id.login_type_toggle_text)
     TextView registerToggleText;
+    @BindView(R.id.tv_login_title)
+    TextView tvLoginTitle;
+
 
     //用户协议
     @BindView(R.id.tel_agreement_cb)
@@ -89,17 +90,19 @@ public class SignUpFgt extends BaseFragment {
     @Override
     public void onViewCreated() {
         if (registerType == LoginController.PLATFORM_ACCOUNT) {
-            TitleBarUtils.getInstance().setTitle(getActivity(), "账号注册");
+            TitleBarUtils.getInstance().setTitle(getActivity(), "账号");
             forAccountContainer.setVisibility(View.VISIBLE);
             forPhoneContainer.setVisibility(View.GONE);
-            registerToggleText.setText("手机注册");
-            registerToggleIcon.setImageResource(R.mipmap.login_phone);
+            registerToggleText.setText("手机号");
+            tvLoginTitle.setText("账号注册");
+            registerToggleIcon.setImageResource(R.drawable.shouji);
         } else {
-            TitleBarUtils.getInstance().setTitle(getActivity(), "手机注册");
+            TitleBarUtils.getInstance().setTitle(getActivity(), "手机号");
             forAccountContainer.setVisibility(View.GONE);
             forPhoneContainer.setVisibility(View.VISIBLE);
-            registerToggleText.setText("账号注册");
-            registerToggleIcon.setImageResource(R.mipmap.login_account);
+            registerToggleText.setText("账号");
+            tvLoginTitle.setText("手机号注册");
+            registerToggleIcon.setImageResource(R.drawable.zhanghao);
         }
     }
 
@@ -161,7 +164,7 @@ public class SignUpFgt extends BaseFragment {
                 });
     }
 
-    @OnClick(R.id.register_type_toggle)
+    @OnClick(R.id.login_type_toggle)
     public void doToggleLoginType(View view) {
         registerType = registerType == LoginController.PLATFORM_ACCOUNT ? LoginController.PLATFORM_PHONE : LoginController.PLATFORM_ACCOUNT;
         onViewCreated();

app/src/main/java/com/sheep/gamegroup/module/personal/fragment/FgtRechargeBalanceLog.java

@@ -1,7 +1,6 @@
 package com.sheep.gamegroup.module.personal.fragment;
 
 import android.support.v7.widget.RecyclerView;
-
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.ILog;
@@ -9,14 +8,11 @@ import com.sheep.gamegroup.model.entity.RechargeBalanceLog;
 import com.sheep.gamegroup.module.personal.adapter.AdpILog;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.view.fragment.BaseListFragment3;
-
+import io.reactivex.Observable;
 import org.afinal.simplecache.ApiKey;
-
 import java.util.ArrayList;
 import java.util.List;
 
-import io.reactivex.Observable;
-
 /**
  * 我的资产 --> 充值记录
  * Created by realicing on 2018/12/21.

app/src/main/java/com/sheep/gamegroup/module/personal/fragment/FgtRechargeLog.java

@@ -2,33 +2,24 @@ package com.sheep.gamegroup.module.personal.fragment;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.RadioGroup;
 import android.widget.RelativeLayout;
-import android.widget.TextView;
-
 import com.kfzs.duanduan.cardview.ScreenUtil;
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.ILog;
 import com.sheep.gamegroup.model.entity.RechargeLog;
 import com.sheep.gamegroup.module.personal.adapter.AdpILog;
-import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.StringUtils;
-import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.fragment.BaseListFragment3;
 import com.sheep.jiuyan.samllsheep.R;
-
+import io.reactivex.Observable;
 import org.afinal.simplecache.ApiKey;
-
 import java.util.ArrayList;
 import java.util.List;
 
-import io.reactivex.Observable;
-import rx.functions.Action1;
-
 /**
  * 我的资产 --> 收支明细
  * Created by realicing on 2018/12/21.

app/src/main/java/com/sheep/gamegroup/module/personal/fragment/FgtWithdraw.java

@@ -1,7 +1,6 @@
 package com.sheep.gamegroup.module.personal.fragment;
 
 import android.support.v7.widget.RecyclerView;
-
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.ILog;
@@ -9,12 +8,9 @@ import com.sheep.gamegroup.model.entity.WithdrawalEty;
 import com.sheep.gamegroup.module.personal.adapter.AdpILog;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.view.fragment.BaseListFragment3;
-
 import org.afinal.simplecache.ApiKey;
-
 import java.util.ArrayList;
 import java.util.List;
-
 import io.reactivex.Observable;
 
 /**

app/src/main/java/com/sheep/gamegroup/module/webview/fragment/FgtWebX5.java

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Build;
@@ -23,7 +22,6 @@ import android.view.animation.AnimationUtils;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
-
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.dateview.DateUtil;
 import com.sheep.gamegroup.model.entity.WebParams;
@@ -38,7 +36,6 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-import com.tencent.protocol.sspservice.App;
 import com.tencent.smtt.export.external.interfaces.WebResourceError;
 import com.tencent.smtt.export.external.interfaces.WebResourceRequest;
 import com.tencent.smtt.export.external.interfaces.WebResourceResponse;
@@ -53,17 +50,13 @@ import com.uuzuche.lib_zxing.activity.CodeUtils;
 import com.yalantis.ucrop.util.FileUtils;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.StringCallback;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-
 import butterknife.BindView;
 import cn.finalteam.rxgalleryfinal.utils.CameraUtil;
-import cn.modificator.waterwave_progress.WidgetUtil;
 import okhttp3.Call;
-
 import static android.app.Activity.RESULT_OK;
 
 /**

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -8,7 +8,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
-
+import cn.finalteam.rxgalleryfinal.utils.CameraUtil;
 import com.kfzs.cfyl.share_library.util.CallBackAPI;
 import com.kfzs.duanduan.utils.ApkUtils;
 import com.kfzs.duanduan.utils.NumberFormatUtils;
@@ -22,57 +22,12 @@ import com.sheep.gamegroup.greendao.DDProviderHelper;
 import com.sheep.gamegroup.greendao.download.DownLoadInfo;
 import com.sheep.gamegroup.greendao.download.SdkLoginUser;
 import com.sheep.gamegroup.greendao.download.SheepAd;
-import com.sheep.gamegroup.model.entity.Advertising;
-import com.sheep.gamegroup.model.entity.Agreement;
-import com.sheep.gamegroup.model.entity.Applications;
-import com.sheep.gamegroup.model.entity.Article;
-import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.BulletinEnty;
-import com.sheep.gamegroup.model.entity.CheckUserLabel;
-import com.sheep.gamegroup.model.entity.CommendApp;
-import com.sheep.gamegroup.model.entity.Container;
-import com.sheep.gamegroup.model.entity.CreditCard;
-import com.sheep.gamegroup.model.entity.DialogConfig;
-import com.sheep.gamegroup.model.entity.DialogEntity;
-import com.sheep.gamegroup.model.entity.DiscoveryTopic;
-import com.sheep.gamegroup.model.entity.DiscoveryVideo;
-import com.sheep.gamegroup.model.entity.GameEntity;
-import com.sheep.gamegroup.model.entity.GameListTag;
-import com.sheep.gamegroup.model.entity.GameListType;
-import com.sheep.gamegroup.model.entity.GiftBagApp;
-import com.sheep.gamegroup.model.entity.HomeListEntity;
-import com.sheep.gamegroup.model.entity.IDBean;
-import com.sheep.gamegroup.model.entity.LoginEntity;
-import com.sheep.gamegroup.model.entity.Mission;
-import com.sheep.gamegroup.model.entity.NewbieTask;
-import com.sheep.gamegroup.model.entity.NewbieTaskRecord;
-import com.sheep.gamegroup.model.entity.Release_task;
-import com.sheep.gamegroup.model.entity.RouserArticlesEntity;
-import com.sheep.gamegroup.model.entity.SystemNotification;
-import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
-import com.sheep.gamegroup.model.entity.TaskEty;
-import com.sheep.gamegroup.model.entity.UserEntity;
-import com.sheep.gamegroup.model.entity.VersionInfo;
-import com.sheep.gamegroup.model.entity.Video;
-import com.sheep.gamegroup.model.entity.WebParams;
-import com.sheep.gamegroup.model.entity.WebviewEntity;
-import com.sheep.gamegroup.model.entity.XianWanEntity;
+import com.sheep.gamegroup.model.entity.*;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.model.util.ShowRedDot;
 import com.sheep.gamegroup.module.find.activity.ActFind;
 import com.sheep.gamegroup.module.find.activity.ActMediaChoose;
-import com.sheep.gamegroup.module.game.activity.ActDownloadManager;
-import com.sheep.gamegroup.module.game.activity.ActGameCenterType;
-import com.sheep.gamegroup.module.game.activity.ActGameGroupMore;
-import com.sheep.gamegroup.module.game.activity.ActGameGroupOrGameDetail;
-import com.sheep.gamegroup.module.game.activity.ActGameRank;
-import com.sheep.gamegroup.module.game.activity.ActGitBagList;
-import com.sheep.gamegroup.module.game.activity.ActMyGameList;
-import com.sheep.gamegroup.module.guide.NewbieGuideHelper;
-import com.sheep.gamegroup.module.qrcode.FaceWithQRActivity;
-import com.sheep.gamegroup.module.qrcode.QRCodeActivity;
-import com.sheep.gamegroup.module.search.ActSearch;
-import com.sheep.gamegroup.module.game.activity.ActWelfareSpecialArea;
+import com.sheep.gamegroup.module.game.activity.*;
 import com.sheep.gamegroup.module.game.model.GameCenterType;
 import com.sheep.gamegroup.module.game.model.GameGroup;
 import com.sheep.gamegroup.module.game.model.GiftTags;
@@ -81,7 +36,9 @@ import com.sheep.gamegroup.module.login.ChangePasswordAct;
 import com.sheep.gamegroup.module.login.LoginAct;
 import com.sheep.gamegroup.module.plugin.model.Plugin;
 import com.sheep.gamegroup.module.plugin.util.SheepPluginUtil;
-import com.sheep.gamegroup.module.skin.util.SkinUtil;
+import com.sheep.gamegroup.module.qrcode.FaceWithQRActivity;
+import com.sheep.gamegroup.module.qrcode.QRCodeActivity;
+import com.sheep.gamegroup.module.search.ActSearch;
 import com.sheep.gamegroup.module.task.VideoTaskActivity;
 import com.sheep.gamegroup.module.user.activity.ActMyCart;
 import com.sheep.gamegroup.module.user.activity.ActVip;
@@ -113,19 +70,6 @@ import com.youmi.android.offer.BaseActYmPermissionCheck;
 import com.youmi.android.offer.YmConfig;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.FileCallBack;
-
-import org.afinal.simplecache.DataKey;
-import org.greenrobot.eventbus.EventBus;
-import org.xutils.ex.DbException;
-
-import java.io.File;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.concurrent.atomic.AtomicReference;
-
-import cn.finalteam.rxgalleryfinal.utils.CameraUtil;
 import io.reactivex.Observable;
 import io.reactivex.ObservableOnSubscribe;
 import io.reactivex.ObservableSource;
@@ -135,44 +79,22 @@ import io.reactivex.schedulers.Schedulers;
 import me.iwf.photopicker.PhotoPicker;
 import me.iwf.photopicker.PhotoPreview;
 import okhttp3.Call;
+import org.afinal.simplecache.DataKey;
+import org.greenrobot.eventbus.EventBus;
+import org.xutils.ex.DbException;
 import rx.functions.Action1;
 
-import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_CREDIT_CARD;
-import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_REWARD;
-import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_VIDEO_AD;
-import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_WELFARE;
+import java.io.File;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import static com.sheep.gamegroup.model.entity.TaskEty.*;
 import static com.sheep.gamegroup.module.game.activity.ActGameGroupOrGameDetail.AUTO_DOWNLOAD;
 import static com.sheep.gamegroup.module.game.activity.ActGameGroupOrGameDetail.KEY_HAS_WELFARE;
 import static com.sheep.gamegroup.util.Constant.REQUEST_CODE_GOT_REWARDS;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.ASK_MAKE_MONEY_INVITATION;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.FIND_ITEM;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_DOWNLOAD_WELFARE_LIST;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_EVERY_DAY_MORE;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_GIFT_CENTER;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_GROUP_DETAIL;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_GROUP_SEARCH;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_INSTEAD_OF_RECHARGE;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_MY_WELFARE;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_PLAY_GAME_DETAIL;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_WELFARE_SPECIAL_AREA;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.GIFT_DETAIL;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.MI_DONG_VIEW;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.RECHARGE;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.RECHARGE_QQ;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.SEARCH_GAME;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.SETTING;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.SYSTEM_NOTIFICATION_DETAIL;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_ABOUT_US;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_CHANGE_PASSWORD;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_FEEDBACK;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_FIND_APP_ORDER;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_GAME_ACCOUNT;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_INFO;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_INFO_ADDR;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_MY_MONEY;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_NEW_VERSION;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_TASK_RECORD;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.XIAOMI_GAME_LIST;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.*;
 import static com.sheep.jiuyan.samllsheep.service.FloatShotScreenService.SET_SHOW_OR_HIDE;
 import static com.sheep.jiuyan.samllsheep.utils.ClassFileHelper.DIR;
 

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

@@ -9,12 +9,10 @@ import android.support.v4.view.ViewPager;
 import android.support.v4.widget.NestedScrollView;
 import android.text.Html;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
-
 import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.kfzs.duanduan.utils.StatusBarUtils;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
@@ -26,16 +24,13 @@ import com.sheep.gamegroup.absBase.ILoadMore;
 import com.sheep.gamegroup.absBase.IRefresh;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.UserAssets;
-import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.entity.WebParams;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.module.home.fragment.FgtHome;
 import com.sheep.gamegroup.module.personal.fragment.FgtRechargeBalanceLog;
 import com.sheep.gamegroup.module.personal.fragment.FgtRechargeLog;
 import com.sheep.gamegroup.module.personal.fragment.FgtWithdraw;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
-import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.RefreshUtil;
@@ -47,14 +42,11 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-
 import org.afinal.simplecache.ApiKey;
-
 import butterknife.BindView;
 import butterknife.OnClick;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
-
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.MY_MONEY_TAB;
 
 /**

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtPersonalCenter.java

@@ -7,42 +7,25 @@ import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.PopupWindow;
-import android.widget.ScrollView;
-import android.widget.TextView;
-
+import android.widget.*;
+import butterknife.BindView;
+import butterknife.OnClick;
 import com.kfzs.duanduan.cardview.ScreenUtil;
 import com.kfzs.duanduan.utils.ApkUtils;
 import com.kfzs.duanduan.utils.NumberFormatUtils;
-import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.Mission;
-import com.sheep.gamegroup.model.entity.UserEntity;
-import com.sheep.gamegroup.model.entity.UserTaskExistsNew;
-import com.sheep.gamegroup.model.entity.WebParams;
+import com.sheep.gamegroup.model.entity.*;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.module.guide.NewbieGuideHelper;
 import com.sheep.gamegroup.module.home.adapter.AdpHomeList;
-import com.sheep.gamegroup.util.CommonUtil;
-import com.sheep.gamegroup.util.DataUtil;
-import com.sheep.gamegroup.util.GlideImageLoader;
-import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.ListUtil;
-import com.sheep.gamegroup.util.SysAppUtil;
-import com.sheep.gamegroup.util.TestUtil;
-import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.gamegroup.util.*;
 import com.sheep.gamegroup.util.share.ShareLinkConfig;
-import com.sheep.gamegroup.view.activity.ActMain;
 import com.sheep.gamegroup.view.activity.PersonalCenterAct;
-import com.sheep.gamegroup.view.activity.PersonalInfoAct;
 import com.sheep.gamegroup.view.activity.ReNameActivity;
 import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
@@ -51,28 +34,19 @@ import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 import com.sheep.jiuyan.samllsheep.bean.UserCenterModule;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 import org.afinal.simplecache.ACache;
 import org.afinal.simplecache.ApiKey;
 import org.greenrobot.eventbus.EventBus;
+import rx.functions.Action1;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
-import butterknife.BindView;
-import butterknife.OnClick;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;
-import rx.functions.Action1;
-
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_AGENT;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_FAQ;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_INFO_LOGINNAME;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_INFO_NAME;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_SHARE;
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_UPGRADE;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.*;
 import static com.sheep.gamegroup.util.ViewUtil.backgroundAlpha;
 
 /**

app/src/main/res/drawable/bg_login_edit_text_act.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="28dp"/>
+    <solid android:color="#F1F4F9"/>
+    <stroke android:color="#2EBEF2" android:width="1dp"/>
+</shape>

app/src/main/res/drawable/bg_login_edit_text_def.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="28dp"/>
+    <solid android:color="#F1F4F9"/>
+    <stroke android:color="#F1F4F9"/>
+</shape>

app/src/main/res/drawable/round_main_r28.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="28dp" />
+    <solid android:color="@color/btn_color_main_stroke" />
+</shape>

app/src/main/res/drawable/selector_login_edit_text.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/bg_login_edit_text_def" android:state_focused="false"/>
+    <item android:drawable="@drawable/bg_login_edit_text_act" android:state_focused="true"/>
+</selector>

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

@@ -1,257 +1,259 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@mipmap/home_blue_bg">
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical"
+              android:background="@mipmap/home_blue_bg">
 
     <android.support.constraint.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="180dp">
+            android:layout_width="match_parent"
+            android:layout_height="180dp">
 
         <RelativeLayout
-            android:id="@+id/layout_navigationBar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:layout_marginTop="10dp"
-            app:layout_constraintTop_toTopOf="parent">
+                android:id="@+id/layout_navigationBar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:layout_marginTop="10dp"
+                app:layout_constraintTop_toTopOf="parent">
 
             <ImageView
-                android:id="@+id/img_baseactivity_title"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_centerVertical="true"
-                android:gravity="center_vertical"
-                android:minWidth="?attr/actionBarSize"
-                android:scaleType="centerInside"
-                android:src="@drawable/narrow_back_white"
-                android:visibility="invisible" />
+                    android:id="@+id/img_baseactivity_title"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:layout_centerVertical="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentBottom="true"
+                    android:gravity="center_vertical"
+                    android:minWidth="?attr/actionBarSize"
+                    android:scaleType="centerInside"
+                    android:src="@drawable/narrow_back_white"
+                    android:visibility="visible"/>
 
             <TextView
-                android:id="@+id/txt_baseactivity_title"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_centerInParent="true"
-                android:gravity="center"
-                android:text="@string/personal_center"
-                android:textColor="@color/white"
-                android:textSize="18sp"
-                android:visibility="gone" />
+                    android:id="@+id/txt_baseactivity_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_centerInParent="true"
+                    android:gravity="center"
+                    android:text="@string/personal_center"
+                    android:textColor="@color/white"
+                    android:textSize="18sp"
+                    android:visibility="gone"/>
 
             <ImageButton
-                android:id="@+id/ibtn_baseactivity_right"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentBottom="true"
-                android:layout_marginEnd="16dp"
-                android:background="@color/translate"
-                android:src="@mipmap/setting" />
-
+                    android:id="@+id/ibtn_baseactivity_right"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:scaleType="centerInside"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginEnd="16dp"
+                    android:background="@color/translate"
+                    android:src="@mipmap/setting"/>
 
             <include
-                layout="@layout/title_bottom_line"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:visibility="gone" />
+                    layout="@layout/title_bottom_line"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentBottom="true"
+                    android:visibility="gone"/>
         </RelativeLayout>
 
         <ImageView
-            android:id="@+id/icon_img_iv"
-            android:layout_width="55dp"
-            android:layout_height="55dp"
-            android:layout_marginTop="16dp"
-            android:src="@drawable/avatar"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+                android:id="@+id/icon_img_iv"
+                android:layout_width="55dp"
+                android:layout_height="55dp"
+                android:layout_marginTop="16dp"
+                android:src="@drawable/avatar"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"/>
 
         <TextView
-            android:id="@+id/name_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:text="Billyyoyo"
-            android:textColor="@color/txt_white"
-            android:textSize="15sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/icon_img_iv" />
+                android:id="@+id/name_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp"
+                android:text="Billyyoyo"
+                android:textColor="@color/txt_white"
+                android:textSize="15sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/icon_img_iv"/>
 
         <ImageView
-            android:id="@+id/edit_nickname_view"
-            android:layout_width="12dp"
-            android:layout_height="12dp"
-            android:layout_marginTop="53dp"
-            android:layout_marginLeft="6dp"
-            android:adjustViewBounds="true"
-            android:src="@mipmap/edit"
-            app:layout_constraintBottom_toBottomOf="@+id/name_tv"
-            app:layout_constraintStart_toEndOf="@+id/name_tv" />
+                android:id="@+id/edit_nickname_view"
+                android:layout_width="12dp"
+                android:layout_height="12dp"
+                android:layout_marginTop="53dp"
+                android:layout_marginLeft="6dp"
+                android:adjustViewBounds="true"
+                android:src="@mipmap/edit"
+                app:layout_constraintBottom_toBottomOf="@+id/name_tv"
+                app:layout_constraintStart_toEndOf="@+id/name_tv"/>
 
         <ImageView
-            android:id="@+id/vip_flag_view"
-            android:layout_width="wrap_content"
-            android:layout_height="16dp"
-            android:layout_marginTop="56dp"
-            android:adjustViewBounds="true"
-            android:src="@mipmap/level_vip"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+                android:id="@+id/vip_flag_view"
+                android:layout_width="wrap_content"
+                android:layout_height="16dp"
+                android:layout_marginTop="56dp"
+                android:adjustViewBounds="true"
+                android:src="@mipmap/level_vip"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"/>
 
         <TextView
-            android:id="@+id/vertical_seperator"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:text="|"
-            android:textColor="@color/txt_white"
-            android:textSize="@dimen/text_size_11"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/name_tv"
-            app:layout_goneMarginLeft="8dp"
-            app:layout_goneMarginRight="8dp" />
+                android:id="@+id/vertical_seperator"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp"
+                android:text="|"
+                android:textColor="@color/txt_white"
+                android:textSize="@dimen/text_size_11"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/name_tv"
+                app:layout_goneMarginLeft="8dp"
+                app:layout_goneMarginRight="8dp"/>
 
         <TextView
-            android:id="@+id/sheep_num_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:text="绵羊号："
-            android:layout_marginEnd="@dimen/content_padding_10"
-            android:textColor="@color/txt_white"
-            android:textSize="@dimen/text_size_11"
-            app:layout_constraintEnd_toStartOf="@+id/vertical_seperator"
-            app:layout_constraintTop_toBottomOf="@+id/name_tv" />
+                android:id="@+id/sheep_num_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp"
+                android:text="绵羊号："
+                android:layout_marginEnd="@dimen/content_padding_10"
+                android:textColor="@color/txt_white"
+                android:textSize="@dimen/text_size_11"
+                app:layout_constraintEnd_toStartOf="@+id/vertical_seperator"
+                app:layout_constraintTop_toBottomOf="@+id/name_tv"/>
 
         <TextView
-            android:id="@+id/login_name_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/content_padding_10"
-            android:layout_marginTop="6dp"
-            android:text="绵羊号："
-            android:textColor="@color/txt_white"
-            android:textSize="@dimen/text_size_11"
-            app:layout_constraintStart_toEndOf="@+id/vertical_seperator"
-            app:layout_constraintTop_toBottomOf="@+id/name_tv" />
+                android:id="@+id/login_name_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/content_padding_10"
+                android:layout_marginTop="6dp"
+                android:text="绵羊号："
+                android:textColor="@color/txt_white"
+                android:textSize="@dimen/text_size_11"
+                app:layout_constraintStart_toEndOf="@+id/vertical_seperator"
+                app:layout_constraintTop_toBottomOf="@+id/name_tv"/>
 
     </android.support.constraint.ConstraintLayout>
 
     <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <RelativeLayout
-            android:id="@+id/vip_layout"
-            android:layout_marginLeft="24dp"
-            android:layout_marginRight="24dp"
-            android:background="@mipmap/bg_vip"
             android:layout_width="match_parent"
-            android:layout_height="80dp">
+            android:layout_height="wrap_content">
+        <RelativeLayout
+                android:id="@+id/vip_layout"
+                android:layout_marginLeft="24dp"
+                android:layout_marginRight="24dp"
+                android:background="@mipmap/bg_vip"
+                android:layout_width="match_parent"
+                android:layout_height="80dp">
             <ImageView
-                android:id="@+id/iv_crown"
-                android:src="@mipmap/crown"
-                android:layout_marginTop="14dp"
-                android:layout_marginLeft="20dp"
-                android:layout_width="23dp"
-                android:layout_height="20dp" />
+                    android:id="@+id/iv_crown"
+                    android:src="@mipmap/crown"
+                    android:layout_marginTop="14dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_width="23dp"
+                    android:layout_height="20dp"/>
             <TextView
-                android:text="VIP特权"
-                android:layout_marginLeft="8dp"
-                android:textSize="15sp"
-                android:textColor="#f9c85d"
-                android:gravity="center"
-                android:layout_alignTop="@+id/iv_crown"
-                android:layout_toRightOf="@+id/iv_crown"
-                android:layout_width="wrap_content"
-                android:layout_height="20dp" />
+                    android:text="VIP特权"
+                    android:layout_marginLeft="8dp"
+                    android:textSize="15sp"
+                    android:textColor="#f9c85d"
+                    android:gravity="center"
+                    android:layout_alignTop="@+id/iv_crown"
+                    android:layout_toRightOf="@+id/iv_crown"
+                    android:layout_width="wrap_content"
+                    android:layout_height="20dp"/>
 
             <TextView
-                android:id="@+id/sale_words"
-                android:text="省钱福利多, 你不了解一下"
-                android:layout_marginRight="20dp"
-                android:textSize="13sp"
-                android:textColor="#f9c85d"
-                android:gravity="center"
-                android:layout_alignParentRight="true"
-                android:layout_marginTop="8dp"
-                android:layout_width="wrap_content"
-                android:layout_height="20dp" />
-            
+                    android:id="@+id/sale_words"
+                    android:text="省钱福利多, 你不了解一下"
+                    android:layout_marginRight="20dp"
+                    android:textSize="13sp"
+                    android:textColor="#f9c85d"
+                    android:gravity="center"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginTop="8dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="20dp"/>
+
             <TextView
-                android:id="@+id/tip_vip"
-                android:layout_alignLeft="@+id/sale_words"
-                android:layout_below="@+id/sale_words"
-                android:text="VIP有效期: 2019-06-03到期"
-                android:textSize="10sp"
-                android:textColor="#cfbf9c"
-                android:visibility="gone"
-                android:layout_marginTop="3dp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-            
+                    android:id="@+id/tip_vip"
+                    android:layout_alignLeft="@+id/sale_words"
+                    android:layout_below="@+id/sale_words"
+                    android:text="VIP有效期: 2019-06-03到期"
+                    android:textSize="10sp"
+                    android:textColor="#cfbf9c"
+                    android:visibility="gone"
+                    android:layout_marginTop="3dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+
             <TextView
-                android:id="@+id/be_vip_btn"
-                android:text="升级成为VIP"
-                android:textColor="#1c1819"
-                android:textSize="10sp"
-                android:layout_alignLeft="@id/sale_words"
-                android:layout_below="@id/sale_words"
-                android:layout_marginTop="3dp"
-                android:paddingTop="2dp"
-                android:paddingBottom="2dp"
-                android:paddingLeft="4dp"
-                android:paddingRight="4dp"
-                android:background="@drawable/yellow_btn"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-            
+                    android:id="@+id/be_vip_btn"
+                    android:text="升级成为VIP"
+                    android:textColor="#1c1819"
+                    android:textSize="10sp"
+                    android:layout_alignLeft="@id/sale_words"
+                    android:layout_below="@id/sale_words"
+                    android:layout_marginTop="3dp"
+                    android:paddingTop="2dp"
+                    android:paddingBottom="2dp"
+                    android:paddingLeft="4dp"
+                    android:paddingRight="4dp"
+                    android:background="@drawable/yellow_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+
         </RelativeLayout>
         <LinearLayout
-            android:id="@+id/personalcenter_price_layout"
-            android:layout_width="match_parent"
-            android:layout_height="80dp"
-            android:layout_marginTop="40dp"
-            android:paddingTop="35dp"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:background="@mipmap/baise">
+                android:id="@+id/personalcenter_price_layout"
+                android:layout_width="match_parent"
+                android:layout_height="80dp"
+                android:layout_marginTop="40dp"
+                android:paddingTop="35dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
+                android:background="@mipmap/baise">
 
             <ImageView
-                android:id="@+id/personalcenter_item_price_ic"
-                style="@style/style_item_img"
-                android:src="@mipmap/my_assets" />
+                    android:id="@+id/personalcenter_item_price_ic"
+                    style="@style/style_item_img"
+                    android:src="@mipmap/my_assets"/>
 
             <TextView
-                android:id="@+id/personalcenter_item_price_tag"
-                style="@style/style_item_label"
-                android:textSize="15sp"
-                android:textColor="#333333"
-                android:text="我的资产" />
+                    android:id="@+id/personalcenter_item_price_tag"
+                    style="@style/style_item_label"
+                    android:textSize="15sp"
+                    android:textColor="#333333"
+                    android:text="我的资产"/>
 
             <View
-                android:id="@+id/pc_mm_red_dot_v"
-                android:layout_width="8dp"
-                android:layout_height="8dp"
-                android:layout_marginEnd="2dp"
-                android:background="@drawable/shape_oval_red"
-                android:visibility="gone" />
+                    android:id="@+id/pc_mm_red_dot_v"
+                    android:layout_width="8dp"
+                    android:layout_height="8dp"
+                    android:layout_marginEnd="2dp"
+                    android:background="@drawable/shape_oval_red"
+                    android:visibility="gone"/>
             <TextView
-                android:id="@+id/personalcenter_item_price_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="0.00元"
-                android:textColor="#ff2ebff3"
-                android:textSize="15sp" />
+                    android:id="@+id/personalcenter_item_price_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="0.00元"
+                    android:textColor="#ff2ebff3"
+                    android:textSize="15sp"/>
         </LinearLayout>
     </RelativeLayout>
 

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

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/third_login_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="48dp"
+        android:layout_marginEnd="48dp"
+        android:layout_gravity="bottom"
+        android:paddingLeft="20dp"
+        android:paddingRight="20dp">
+
+    <LinearLayout
+            android:id="@+id/login_type_toggle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:layout_weight="1">
+
+        <ImageView
+                android:id="@+id/login_type_toggle_icon"
+                style="@style/login_type_icon"
+                android:src="@drawable/zhanghao"/>
+
+        <TextView
+                android:id="@+id/login_type_toggle_text"
+                style="@style/login_type_text"
+                android:text="账号登录"/>
+    </LinearLayout>
+
+    <LinearLayout
+            android:id="@+id/qq_login_btn"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:layout_weight="1">
+
+        <ImageView
+                style="@style/login_type_icon"
+                android:src="@drawable/qq"/>
+
+        <TextView
+                style="@style/login_type_text"
+                android:text="QQ"/>
+    </LinearLayout>
+
+    <LinearLayout
+            android:id="@+id/wx_login_btn"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:layout_weight="1">
+
+        <ImageView
+                style="@style/login_type_icon"
+                android:src="@drawable/weixin"/>
+
+        <TextView
+                style="@style/login_type_text"
+                android:text="微信"/>
+    </LinearLayout>
+
+
+</LinearLayout>

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

@@ -1,86 +1,85 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    >
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
 
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:layout_marginBottom="16dp"
-        android:layout_above="@+id/thirdpart_login_container"
-        android:orientation="horizontal">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:layout_marginBottom="16dp"
+            android:layout_above="@+id/thirdpart_login_container"
+            android:orientation="horizontal">
 
         <View
-            android:background="@color/G"
-            style="@style/login_separetor_line_style"
-            android:layout_width="20dp"/>
+                android:background="@color/G"
+                style="@style/login_separetor_line_style"
+                android:layout_width="20dp"/>
 
         <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
-            android:layout_marginBottom="2dp"
-            android:textSize="13sp"
-            android:text="or"
-            android:textColor="@color/G" />
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:layout_marginBottom="2dp"
+                android:textSize="13sp"
+                android:text="or"
+                android:textColor="@color/G"/>
 
         <View
-            style="@style/login_separetor_line_style"
-            android:background="@color/G"
-            android:layout_width="20dp"/>
+                style="@style/login_separetor_line_style"
+                android:background="@color/G"
+                android:layout_width="20dp"/>
 
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/thirdpart_login_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:orientation="horizontal"
-        android:paddingLeft="20dp"
-        android:paddingRight="20dp">
+            android:id="@+id/thirdpart_login_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:orientation="horizontal"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp">
 
         <LinearLayout
-            android:id="@+id/login_type_toggle"
-            style="@style/login_type_btn">
+                android:id="@+id/login_type_toggle"
+                style="@style/login_type_btn">
 
             <ImageView
-                android:id="@+id/login_type_toggle_icon"
-                style="@style/login_type_icon"
-                android:src="@mipmap/login_account" />
+                    android:id="@+id/login_type_toggle_icon"
+                    style="@style/login_type_icon"
+                    android:src="@mipmap/login_account"/>
 
             <TextView
-                android:id="@+id/login_type_toggle_text"
-                style="@style/login_type_text"
-                android:text="账号登录" />
+                    android:id="@+id/login_type_toggle_text"
+                    style="@style/login_type_text"
+                    android:text="账号登录"/>
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/qq_login_btn"
-            style="@style/login_type_btn">
+                android:id="@+id/qq_login_btn"
+                style="@style/login_type_btn">
 
             <ImageView
-                style="@style/login_type_icon"
-                android:src="@mipmap/login_qq" />
+                    style="@style/login_type_icon"
+                    android:src="@mipmap/login_qq"/>
 
             <TextView
-                style="@style/login_type_text"
-                android:text="QQ" />
+                    style="@style/login_type_text"
+                    android:text="QQ"/>
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/wx_login_btn"
-            style="@style/login_type_btn">
+                android:id="@+id/wx_login_btn"
+                style="@style/login_type_btn">
 
             <ImageView
-                style="@style/login_type_icon"
-                android:src="@mipmap/login_wx" />
+                    style="@style/login_type_icon"
+                    android:src="@mipmap/login_wx"/>
 
             <TextView
-                style="@style/login_type_text"
-                android:text="微信" />
+                    style="@style/login_type_text"
+                    android:text="微信"/>
         </LinearLayout>
 
 

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

@@ -64,10 +64,11 @@
             android:id="@+id/send_captcha_btn"
             android:text="获取验证码"
             android:textSize="12sp"
+            android:textColor="@color/white"
             android:textStyle="normal"
             android:layout_marginTop="22dp"
             android:layout_alignParentRight="true"
-            style="@style/login_theme_round_button"
+            android:background="@drawable/round_main_r28"
             android:layout_width="wrap_content"
             android:layout_height="20dp"/>
 

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

@@ -1,59 +1,108 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/content_padding_24">
-
-    <ImageView
-        android:id="@+id/welcome_header"
-        android:src="@mipmap/welcome_head"
-        android:adjustViewBounds="true"
+<android.support.constraint.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-    <Button
-        android:id="@+id/register_btn"
-        style="@style/login_theme_round_button"
-        android:layout_below="@+id/welcome_header"
-        android:layout_marginTop="50dp"
-        android:layout_marginLeft="@dimen/content_padding_24"
-        android:layout_marginRight="@dimen/content_padding_24"
-        android:text="新用户注册" />
-
-    <Button
-        android:id="@+id/login_btn"
-        style="@style/login_theme_round_button"
-        android:layout_below="@+id/register_btn"
-        android:layout_marginTop="16dp"
-        android:layout_marginLeft="@dimen/content_padding_24"
-        android:layout_marginRight="@dimen/content_padding_24"
-        android:text="登录" />
-
-    <include layout="@layout/footer_thirdpart_login" />
+        android:layout_height="match_parent" xmlns:tools="http://schemas.android.com/tools"
+        android:background="@drawable/bg_login"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:orientation="vertical">
+
+
+    <TextView
+            android:id="@+id/test_change"
+            style="@style/style_button_small_yellow"
+            android:layout_width="wrap_content"
+            android:layout_height="30dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginTop="@dimen/content_padding_36"
+            android:paddingEnd="@dimen/dp_10"
+            android:paddingStart="@dimen/dp_10"
+            android:layout_marginEnd="10dp"
+            android:text="切换服务器"
+            android:visibility="gone"
+            tools:visibility="visible"/>
 
     <TextView
-        android:id="@+id/test_change"
-        style="@style/style_button_small_yellow"
-        android:layout_width="wrap_content"
-        android:layout_height="30dp"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentTop="true"
-        android:layout_margin="@dimen/dp_10"
-        android:paddingEnd="@dimen/dp_10"
-        android:paddingStart="@dimen/dp_10"
-        android:text="切换服务器"
-        android:visibility="gone" />
+            android:id="@+id/test_change_user"
+            style="@style/style_button_small_yellow"
+            android:layout_width="wrap_content"
+            android:layout_height="30dp"
+            app:layout_constraintEnd_toEndOf="@+id/test_change"
+            app:layout_constraintTop_toBottomOf="@id/test_change"
+            android:layout_margin="@dimen/dp_10"
+            android:paddingEnd="@dimen/dp_10"
+            android:paddingStart="@dimen/dp_10"
+            android:text="切换账号"
+            tools:visibility="visible"
+            android:visibility="invisible"
+            app:layout_constraintStart_toStartOf="@+id/test_change"/>
+
+    <ImageView
+            android:id="@+id/imageView3"
+            android:layout_width="76dp"
+            android:layout_height="76dp"
+            android:layout_marginTop="48dp"
+            android:src="@drawable/logo"
+            android:layout_marginBottom="12dp"
+            app:layout_constraintEnd_toEndOf="@+id/tv_app_name"
+            app:layout_constraintStart_toStartOf="@+id/tv_app_name"
+            app:layout_constraintTop_toTopOf="parent"/>
 
     <TextView
-        android:id="@+id/test_change_user"
-        style="@style/style_button_small_yellow"
-        android:layout_width="wrap_content"
-        android:layout_height="30dp"
-        android:layout_alignParentEnd="true"
-        android:layout_below="@+id/test_change"
-        android:layout_margin="@dimen/dp_10"
-        android:paddingEnd="@dimen/dp_10"
-        android:paddingStart="@dimen/dp_10"
-        android:text="切换账号"
-        android:visibility="gone" />
-</RelativeLayout>
+            android:id="@+id/tv_app_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/white"
+            android:layout_marginTop="8dp"
+            android:textSize="17dp"
+            android:text="小绵羊"
+            app:layout_constraintEnd_toEndOf="@+id/cardView"
+            app:layout_constraintStart_toStartOf="@+id/cardView" app:layout_constraintTop_toBottomOf="@+id/imageView3"/>
+
+    <android.support.v7.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:cardCornerRadius="8dp"
+            android:layout_marginTop="64dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:id="@+id/cardView"
+            app:layout_constraintTop_toBottomOf="@+id/tv_app_name">
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+            <Button
+                    android:id="@+id/register_btn"
+                    style="@style/login_theme_round_button"
+                    android:layout_marginTop="76dp"
+                    android:layout_marginLeft="@dimen/content_padding_24"
+                    android:layout_marginRight="@dimen/content_padding_24"
+                    android:text="新用户注册"/>
+
+            <Button
+                    android:id="@+id/login_btn"
+                    style="@style/login_theme_round_button"
+                    android:layout_marginTop="42dp"
+                    android:layout_marginBottom="76dp"
+                    android:layout_marginLeft="@dimen/content_padding_24"
+                    android:layout_marginRight="@dimen/content_padding_24"
+                    android:text="登录"/>
+
+        </LinearLayout>
+
+    </android.support.v7.widget.CardView>
+
+    <include layout="@layout/footer_third_login"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             android:layout_marginBottom="24dp"
+             app:layout_constraintBottom_toBottomOf="parent"
+             app:layout_constraintStart_toStartOf="parent"
+             app:layout_constraintEnd_toEndOf="parent"/>
+
+</android.support.constraint.ConstraintLayout>

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

@@ -1,159 +1,304 @@
-<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:padding="@dimen/content_padding_24">
+<android.support.constraint.ConstraintLayout
+        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"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:background="@drawable/bg_login">
 
+    <TextView
+            android:id="@+id/tv_login_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="28dp"
+            android:textColor="@color/white"
+            android:textSize="19dp"
+            android:text="登录小绵羊"
+            android:layout_marginTop="36dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toEndOf="@+id/cardView"
+            app:layout_constraintStart_toStartOf="@+id/cardView"/>
 
-    <RelativeLayout
-        android:id="@+id/for_account_pwd_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="50dp">
+    <ImageView
+            android:layout_width="76dp"
+            android:layout_height="76dp"
+            android:src="@drawable/logo"
+            android:layout_marginTop="18dp"
+            app:layout_constraintEnd_toEndOf="@+id/tv_app_name"
+            app:layout_constraintStart_toStartOf="@+id/tv_app_name"
+            android:id="@+id/imageView3"
+            app:layout_constraintTop_toBottomOf="@+id/tv_login_title"/>
 
-        <EditText
-            android:id="@+id/user_name_box"
-            style="@style/login_edit_style_name"
-            android:hint="请输入用户名/手机号"
-            android:maxLength="20" />
+    <TextView
+            android:id="@+id/tv_app_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/white"
+            android:layout_marginTop="12dp"
+            android:textSize="17dp"
+            android:text="小绵羊"
+            app:layout_constraintEnd_toEndOf="@+id/cardView"
+            app:layout_constraintStart_toStartOf="@+id/cardView"
+            app:layout_constraintTop_toBottomOf="@+id/imageView3"/>
 
-        <View
-            style="@style/login_separetor_line_style"
-            android:layout_below="@+id/user_name_box" />
+    <android.support.v7.widget.CardView
+            android:id="@+id/cardView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:cardCornerRadius="12dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_app_name">
 
-        <EditText
-            android:id="@+id/password_box"
-            style="@style/login_edit_style_pwd"
-            android:layout_below="@+id/user_name_box"
-            android:hint="请输入密码(6-16位)"
-            android:inputType="textPassword"
-            android:maxLength="16" />
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
-        <ImageView
-            android:id="@+id/show_hide_pwd_btn"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_below="@+id/user_name_box"
-            android:layout_alignParentRight="true"
-            android:layout_marginTop="26dp"
-            android:padding="7dp"
-            android:src="@mipmap/pwd_hide"
-            android:tint="@color/bg_line" />
+            <android.support.constraint.ConstraintLayout
+                    android:id="@+id/cl_account_login"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:visibility="gone"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent">
 
-        <View
-            style="@style/login_separetor_line_style"
-            android:layout_below="@+id/password_box" />
+                <EditText
+                        android:id="@+id/user_name_box"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="26dp"
+                        android:layout_marginEnd="26dp"
+                        android:paddingStart="28dp"
+                        android:paddingEnd="28dp"
+                        android:paddingTop="21dp"
+                        android:paddingBottom="21dp"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        style="@style/login_edit_style_name"
+                        android:hint="请输入用户名/手机号"
+                        android:maxLength="20"/>
 
-        <EditText
-            android:id="@+id/verify_box"
-            style="@style/login_edit_style_name"
-            android:layout_below="@+id/password_box"
-            android:layout_width="80dp"
-            android:hint="验证码"
-            android:visibility="gone"
-            android:maxLength="16" />
-        
-        <ImageView
-            android:id="@+id/captcha_code_view"
-            android:background="@color/gray_F0F0F0"
-            android:layout_below="@+id/password_box"
-            android:layout_toRightOf="@+id/verify_box"
-            android:layout_marginLeft="16dp"
-            android:layout_marginTop="20dp"
-            android:visibility="gone"
-            android:layout_width="120dp"
-            android:layout_height="40dp" />
+                <ImageView
+                        android:id="@+id/account_menu_btn"
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+                        android:layout_marginEnd="12dp"
+                        android:layout_alignParentRight="true"
+                        android:padding="8dp"
+                        android:src="@mipmap/arrow_down"
+                        android:tint="@color/black_6_3"
+                        app:layout_constraintEnd_toEndOf="@+id/user_name_box"
+                        app:layout_constraintBottom_toBottomOf="@+id/user_name_box"
+                        app:layout_constraintTop_toTopOf="@+id/user_name_box"/>
 
-        <View
-            android:id="@+id/captcha_seperator"
-            style="@style/login_separetor_line_style"
-            android:layout_width="80dp"
-            android:visibility="gone"
-            android:layout_below="@+id/verify_box" />
-    </RelativeLayout>
+                <EditText
+                        android:id="@+id/password_box"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:paddingStart="28dp"
+                        android:paddingEnd="28dp"
+                        android:paddingTop="21dp"
+                        android:paddingBottom="21dp"
+                        android:layout_marginBottom="16dp"
+                        style="@style/login_edit_style_pwd"
+                        app:layout_constraintTop_toBottomOf="@id/user_name_box"
+                        android:background="@drawable/selector_login_edit_text"
+                        android:hint="请输入密码(6-16位)"
+                        android:inputType="textPassword"
+                        android:maxLength="16"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="@+id/user_name_box"
+                        app:layout_constraintEnd_toEndOf="@+id/user_name_box"/>
 
-    <RelativeLayout
-        android:id="@+id/for_phone_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
-        android:visibility="gone">
+                <ImageView
+                        android:id="@+id/show_hide_pwd_btn"
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+                        android:layout_marginEnd="12dp"
+                        android:padding="7dp"
+                        android:src="@mipmap/pwd_hide"
+                        android:tint="@color/bg_line" app:layout_constraintEnd_toEndOf="@+id/password_box" app:layout_constraintBottom_toBottomOf="@+id/password_box"
+                        app:layout_constraintTop_toTopOf="@+id/password_box"/>
 
-        <EditText
-            android:id="@+id/phone_number_box"
-            style="@style/login_edit_style_mobile"
-            android:hint="请输入手机号"
-            android:inputType="phone"
-            android:maxLength="11" />
+            </android.support.constraint.ConstraintLayout>
 
-        <View
-            style="@style/login_separetor_line_style"
-            android:layout_below="@+id/phone_number_box" />
+            <android.support.constraint.ConstraintLayout
+                    android:id="@+id/for_phone_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    android:visibility="visible">
 
-        <EditText
-            android:id="@+id/captcha_box"
-            style="@style/login_edit_style"
-            android:layout_below="@+id/phone_number_box"
-            android:hint="输入验证码"
-            android:inputType="phone"
-            android:maxLength="6" />
+                <EditText
+                        android:id="@+id/phone_number_box"
+                        style="@style/login_edit_style_mobile"
+                        android:hint="请输入手机号"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="26dp"
+                        android:layout_marginEnd="26dp"
+                        android:paddingStart="28dp"
+                        android:paddingEnd="28dp"
+                        android:paddingTop="21dp"
+                        android:paddingBottom="21dp"
+                        android:background="@drawable/selector_login_edit_text"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        android:inputType="phone"
+                        android:maxLength="11"/>
 
-        <View
-            style="@style/login_separetor_line_style"
-            android:layout_below="@+id/captcha_box" />
+                <EditText
+                        android:id="@+id/captcha_box"
+                        style="@style/login_edit_style"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="26dp"
+                        android:layout_marginEnd="26dp"
+                        android:layout_marginBottom="16dp"
+                        android:paddingStart="28dp"
+                        android:paddingEnd="28dp"
+                        android:paddingTop="21dp"
+                        android:paddingBottom="21dp"
+                        android:background="@drawable/selector_login_edit_text"
+                        android:hint="输入验证码"
+                        android:inputType="phone"
+                        android:maxLength="6"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/phone_number_box"/>
 
-        <com.sheep.gamegroup.view.customview.CountDownButton
-            android:id="@+id/send_captcha_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="25dp"
-            android:layout_below="@+id/phone_number_box"
-            android:layout_alignParentRight="true"
-            android:layout_marginTop="28dp"
-            android:background="@drawable/round_main_r25"
-            android:text="获取验证码"
-            android:textColor="@android:color/white"
-            android:textSize="12sp" />
-    </RelativeLayout>
+                <com.sheep.gamegroup.view.customview.CountDownButton
+                        android:id="@+id/send_captcha_btn"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="获取验证码"
+                        android:background="@null"
+                        android:textColor="#4266B2"
+                        android:textSize="12dp"
+                        app:layout_constraintEnd_toEndOf="@+id/captcha_box"
+                        app:layout_constraintTop_toTopOf="@+id/captcha_box"
+                        app:layout_constraintBottom_toBottomOf="@+id/captcha_box"/>
+            </android.support.constraint.ConstraintLayout>
 
-    <ImageView
-        android:id="@+id/account_menu_btn"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_alignParentRight="true"
-        android:layout_marginTop="75dp"
-        android:padding="8dp"
-        android:src="@mipmap/arrow_down"
-        android:tint="@color/black_6_3" />
+            <LinearLayout
+                    android:id="@+id/tel_agreement_ll"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_marginStart="24dp"
+                    android:layout_marginEnd="24dp"
+                    android:layout_marginTop="2dp"
+                    android:layout_marginBottom="24dp">
 
-    <TextView
-        android:id="@+id/trouble_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_marginTop="245dp"
-        android:text="登录遇到问题?"
-        android:textColor="@color/blue_34a6e7"
-        android:textSize="12sp" />
-
-    <Button
-        android:id="@+id/login_btn"
-        style="@style/login_theme_round_button"
-        android:layout_below="@+id/trouble_btn"
-        android:layout_marginTop="20dp"
-        android:text="登录" />
+                <android.support.v7.widget.AppCompatCheckBox
+                        android:id="@+id/cb_remember_pwd"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginStart="6dp"
+                        android:button="@drawable/drawable_selector_check"/>
+                <TextView
+                        android:id="@+id/tel_agreement_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8dp"
+                        android:text="记住密码"
+                        android:textColor="#4266B2"
+                        android:textSize="15dp"/>
 
-    <TextView
-        android:id="@+id/register_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/login_btn"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="16dp"
-        android:text="新用户注册"
-        android:textColor="@color/blue_34a6e7"
-        android:textSize="12sp" />
+                <TextView
+                        android:id="@+id/trouble_btn"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="6dp"
+                        android:gravity="end"
+                        android:text="登录遇到问题?"
+                        android:layout_gravity="end"
+                        android:textColor="#4266B2"
+                        android:textSize="15dp"/>
+
+            </LinearLayout>
+
+            <Button
+                    android:id="@+id/login_btn"
+                    style="@style/login_theme_round_button"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/content_padding_24"
+                    android:layout_marginBottom="36dp"
+                    android:layout_marginStart="26dp"
+                    android:layout_marginEnd="26dp"
+                    android:text="登录"
+                    app:layout_constraintTop_toBottomOf="@id/trouble_btn"
+                    app:layout_constraintStart_toStartOf="@+id/cl_account_login"
+                    app:layout_constraintEnd_toEndOf="@+id/cl_account_login"/>
+
+            <TextView
+                    android:id="@+id/register_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="新用户注册"
+                    android:layout_gravity="center"
+                    android:textColor="@color/blue_34a6e7"
+                    android:textSize="15dp"
+                    android:layout_marginBottom="@dimen/content_padding_24"
+                    app:layout_constraintStart_toStartOf="@+id/login_btn"
+                    app:layout_constraintTop_toBottomOf="@+id/login_btn"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="@+id/login_btn"/>
+
+        </LinearLayout>
+
+    </android.support.v7.widget.CardView>
+
+    <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginTop="50dp">
+
+        <EditText
+                android:id="@+id/verify_box"
+                style="@style/login_edit_style_name"
+                android:layout_width="80dp"
+                android:hint="验证码"
+                android:visibility="gone"
+                android:maxLength="16"/>
+
+        <ImageView
+                android:id="@+id/captcha_code_view"
+                android:background="@color/gray_F0F0F0"
+                android:layout_toRightOf="@+id/verify_box"
+                android:layout_marginLeft="16dp"
+                android:layout_marginTop="20dp"
+                android:visibility="gone"
+                android:layout_width="120dp"
+                android:layout_height="40dp"/>
+
+        <View
+                android:id="@+id/captcha_seperator"
+                style="@style/login_separetor_line_style"
+                android:layout_width="80dp"
+                android:visibility="gone"
+                android:layout_below="@+id/verify_box"/>
+    </RelativeLayout>
 
-    <include layout="@layout/footer_thirdpart_login" />
 
+    <include layout="@layout/footer_third_login"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             app:layout_constraintBottom_toBottomOf="parent"
+             app:layout_constraintStart_toStartOf="parent"
+             app:layout_constraintEnd_toEndOf="parent"
+             android:layout_marginBottom="24dp"/>
 
-</RelativeLayout>
+</android.support.constraint.ConstraintLayout>

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

@@ -1,193 +1,266 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="@dimen/content_padding_24">
-
-    <LinearLayout
-        android:id="@+id/for_account_container"
+<android.support.constraint.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
-        android:visibility="gone"
-        android:orientation="vertical">
+        android:layout_height="match_parent"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:orientation="vertical"
+        android:background="@drawable/bg_login">
 
-        <EditText
-            android:id="@+id/user_name_box"
-            style="@style/login_edit_style_name"
-            android:maxLength="20"
-            android:hint="输入用户名(如常用英文或数字唯一标识)" />
+    <TextView
+            android:id="@+id/tv_login_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/white"
+            android:textSize="19dp"
+            android:text="手机号注册"
+            android:layout_marginTop="36dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toEndOf="@+id/imageView3"
+            app:layout_constraintStart_toStartOf="@+id/imageView3"/>
 
-        <View style="@style/login_separetor_line_style" />
+    <ImageView
+            android:layout_width="76dp"
+            android:layout_height="76dp"
+            android:src="@drawable/logo"
+            android:layout_marginTop="18dp"
+            app:layout_constraintEnd_toEndOf="@+id/tv_app_name"
+            app:layout_constraintStart_toStartOf="@+id/tv_app_name"
+            android:id="@+id/imageView3"
+            app:layout_constraintTop_toBottomOf="@+id/tv_login_title"/>
 
-        <LinearLayout
-            android:orientation="horizontal"
+    <TextView
+            android:id="@+id/tv_app_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/white"
+            android:layout_marginTop="12dp"
+            android:textSize="17dp"
+            android:text="小绵羊"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/imageView3"/>
+
+    <include layout="@layout/footer_third_login"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             android:layout_marginBottom="24dp"
+             app:layout_constraintBottom_toBottomOf="parent"
+             app:layout_constraintStart_toStartOf="parent"
+             app:layout_constraintEnd_toEndOf="parent"/>
+
+    <android.support.v7.widget.CardView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <EditText
-                android:id="@+id/password_box"
-                android:layout_weight="1"
-                style="@style/login_edit_style_pwd"
-                android:hint="输入密码(6-16位)"
-                android:inputType="textPassword"
-                android:lines="1"
-                android:maxLength="16" />
-            <ImageView
-                android:id="@+id/show_hide_pwd_btn"
-                android:src="@mipmap/pwd_hide"
-                android:layout_marginTop="26dp"
-                android:tint="@color/bg_line"
-                android:padding="7dp"
-                android:layout_width="30dp"
-                android:layout_height="30dp" />
-        </LinearLayout>
+            android:layout_height="wrap_content"
+            app:cardCornerRadius="12dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            app:layout_constraintTop_toBottomOf="@id/tv_app_name"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
 
-        <View style="@style/login_separetor_line_style" />
         <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <EditText
-                android:id="@+id/password_box2"
-                android:layout_weight="1"
-                style="@style/login_edit_style_pwd"
-                android:hint="确认密码"
-                android:inputType="textPassword"
-                android:lines="1"
-                android:maxLength="16" />
-            <ImageView
-                android:id="@+id/show_hide_pwd_btn2"
-                android:src="@mipmap/pwd_hide"
-                android:layout_marginTop="26dp"
-                android:tint="@color/bg_line"
-                android:padding="7dp"
-                android:layout_width="30dp"
-                android:layout_height="30dp" />
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+            <LinearLayout
+                    android:id="@+id/for_account_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:gravity="center"
+                    android:visibility="gone"
+                    android:orientation="vertical">
+
+                <EditText
+                        android:id="@+id/user_name_box"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="24dp"
+                        android:layout_marginEnd="24dp"
+                        style="@style/login_edit_style_name"
+                        android:paddingStart="28dp"
+                        android:paddingEnd="28dp"
+                        android:paddingTop="21dp"
+                        android:paddingBottom="21dp"
+                        android:maxLength="20"
+                        android:hint="输入用户名(如常用英文或数字唯一标识)"/>
+
+
+                <android.support.constraint.ConstraintLayout
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="28dp">
+
+                    <EditText
+                            android:id="@+id/password_box"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            android:layout_marginStart="24dp"
+                            android:layout_marginEnd="24dp"
+                            style="@style/login_edit_style_name"
+                            android:paddingStart="28dp"
+                            android:paddingEnd="28dp"
+                            android:paddingTop="21dp"
+                            android:paddingBottom="21dp"
+                            android:hint="输入密码(6-16位)"
+                            android:inputType="textPassword"
+                            android:lines="1"
+                            android:maxLength="16"/>
+                    <ImageView
+                            android:id="@+id/show_hide_pwd_btn"
+                            android:src="@mipmap/pwd_hide"
+                            android:tint="@color/bg_line"
+                            android:layout_marginEnd="@dimen/content_padding_12"
+                            android:padding="7dp"
+                            android:layout_width="30dp"
+                            android:layout_height="30dp" app:layout_constraintEnd_toEndOf="@+id/password_box" app:layout_constraintBottom_toBottomOf="@+id/password_box"
+                            app:layout_constraintTop_toTopOf="@+id/password_box"/>
+                </android.support.constraint.ConstraintLayout>
+
+                <android.support.constraint.ConstraintLayout
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="24dp"
+                        android:layout_marginEnd="24dp"
+                        android:layout_marginTop="28dp">
+
+                    <EditText
+                            android:id="@+id/password_box2"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            style="@style/login_edit_style_name"
+                            android:paddingStart="28dp"
+                            android:paddingEnd="28dp"
+                            android:paddingTop="21dp"
+                            android:paddingBottom="21dp"
+                            android:hint="确认密码"
+                            android:inputType="textPassword"
+                            android:lines="1"
+                            android:maxLength="16"/>
+                    <ImageView
+                            android:id="@+id/show_hide_pwd_btn2"
+                            android:src="@mipmap/pwd_hide"
+                            android:tint="@color/bg_line"
+                            android:layout_marginEnd="@dimen/content_padding_12"
+                            android:padding="7dp"
+                            android:layout_width="30dp"
+                            android:layout_height="30dp"
+                            app:layout_constraintEnd_toEndOf="@+id/password_box2"
+                            app:layout_constraintBottom_toBottomOf="@+id/password_box2"
+                            app:layout_constraintTop_toTopOf="@+id/password_box2"/>
+                </android.support.constraint.ConstraintLayout>
+
+            </LinearLayout>
+
+            <android.support.constraint.ConstraintLayout
+                    android:id="@+id/for_phone_container"
+                    android:visibility="visible"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:gravity="center"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent">
+
+                <EditText
+                        android:id="@+id/phone_number_box"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        android:background="@drawable/selector_login_edit_text"
+                        style="@style/login_edit_style_mobile"
+                        android:hint="请输入手机号"
+                        android:layout_marginStart="24dp"
+                        android:layout_marginEnd="24dp"
+                        android:paddingStart="28dp"
+                        android:paddingEnd="28dp"
+                        android:paddingTop="21dp"
+                        android:paddingBottom="21dp"
+                        android:inputType="phone"
+                        android:maxLength="11"/>
+
+                <EditText
+                        android:id="@+id/captcha_box"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/login_edit_style"
+                        app:layout_constraintTop_toBottomOf="@id/phone_number_box"
+                        android:background="@drawable/selector_login_edit_text"
+                        android:layout_marginStart="24dp"
+                        android:layout_marginEnd="24dp"
+                        android:paddingStart="28dp"
+                        android:paddingEnd="28dp"
+                        android:paddingTop="21dp"
+                        android:paddingBottom="21dp"
+                        android:hint="输入验证码"
+                        android:inputType="phone"
+                        android:maxLength="6"/>
+
+                <com.sheep.gamegroup.view.customview.CountDownButton
+                        android:id="@+id/send_captcha_btn"
+                        android:layout_width="wrap_content"
+                        android:layout_height="25dp"
+                        android:layout_marginEnd="12dp"
+                        android:background="@null"
+                        android:text="获取验证码"
+                        android:textColor="#4266B2"
+                        android:textSize="12sp"
+                        app:layout_constraintEnd_toEndOf="@+id/captcha_box"
+                        app:layout_constraintBottom_toBottomOf="@+id/captcha_box"
+                        app:layout_constraintTop_toTopOf="@+id/captcha_box"/>
+            </android.support.constraint.ConstraintLayout>
+
+            <Button
+                    android:id="@+id/register_btn"
+                    style="@style/login_theme_round_button"
+                    android:layout_marginStart="24dp"
+                    android:layout_marginEnd="24dp"
+                    android:layout_marginTop="54dp"
+                    android:text="注册"/>
+
+            <LinearLayout
+                    android:id="@+id/tel_agreement_ll"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    app:layout_constraintTop_toBottomOf="@id/register_btn"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    android:orientation="horizontal"
+                    android:layout_marginTop="32dp"
+                    android:layout_marginBottom="24dp"
+                    android:gravity="center">
+                <android.support.v7.widget.AppCompatCheckBox
+                        android:id="@+id/tel_agreement_cb"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:button="@drawable/drawable_selector_check"/>
+                <TextView
+                        android:id="@+id/tel_agreement_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8dp"
+                        android:text="我已阅读并同意《小绵羊平台用户协议》"
+                        android:textColor="@color/black_333333"
+                        android:textSize="12sp"/>
+            </LinearLayout>
+
         </LinearLayout>
 
-        <View style="@style/login_separetor_line_style" />
-    </LinearLayout>
 
-    <RelativeLayout
-        android:id="@+id/for_phone_container"
-        android:layout_marginTop="50dp"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/top_bar">
-
-        <EditText
-            android:id="@+id/phone_number_box"
-            style="@style/login_edit_style_mobile"
-            android:hint="请输入手机号"
-            android:inputType="phone"
-            android:maxLength="11" />
-
-        <View
-            style="@style/login_separetor_line_style"
-            android:layout_below="@+id/phone_number_box" />
-
-        <EditText
-            android:id="@+id/captcha_box"
-            style="@style/login_edit_style"
-            android:layout_below="@+id/phone_number_box"
-            android:hint="输入验证码"
-            android:inputType="phone"
-            android:maxLength="6" />
-
-        <View
-            style="@style/login_separetor_line_style"
-            android:layout_below="@+id/captcha_box" />
-
-        <com.sheep.gamegroup.view.customview.CountDownButton
-            android:id="@+id/send_captcha_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="25dp"
-            android:layout_alignParentRight="true"
-            android:layout_below="@+id/phone_number_box"
-            android:layout_marginTop="28dp"
-            android:background="@drawable/round_main_r25"
-            android:text="获取验证码"
-            android:textColor="@android:color/white"
-            android:textSize="12sp" />
-    </RelativeLayout>
-
-    <Button
-        android:id="@+id/register_btn"
-        style="@style/login_theme_round_button"
-        android:layout_marginTop="50dp"
-        android:text="注册" />
-
-    <LinearLayout
-        android:id="@+id/tel_agreement_ll"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="40dp"
-        android:gravity="center">
-        <android.support.v7.widget.AppCompatCheckBox
-            android:id="@+id/tel_agreement_cb"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:button="@drawable/drawable_selector_check"/>
-        <TextView
-            android:id="@+id/tel_agreement_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
-            android:text="我已阅读并同意《小绵羊平台用户协议》"
-            android:textColor="@color/G"
-            android:textSize="12sp"/>
-    </LinearLayout>
-    <View
-        android:layout_weight="1"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:layout_marginBottom="16dp"
-        android:layout_above="@+id/thirdpart_login_container"
-        android:orientation="horizontal">
-
-        <View
-            android:background="@color/G"
-            style="@style/login_separetor_line_style"
-            android:layout_width="20dp"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
-            android:layout_marginBottom="2dp"
-            android:textSize="13sp"
-            android:text="or"
-            android:textColor="@color/G" />
-
-        <View
-            style="@style/login_separetor_line_style"
-            android:background="@color/G"
-            android:layout_width="20dp"/>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/register_type_toggle"
-        style="@style/register_type_btn">
-
-        <ImageView
-            android:id="@+id/register_type_toggle_icon"
-            style="@style/login_type_icon"
-            android:src="@mipmap/login_account" />
-
-        <TextView
-            android:id="@+id/register_type_toggle_text"
-            style="@style/login_type_text"
-            android:text="账号登录" />
-    </LinearLayout>
-
-</LinearLayout>
+    </android.support.v7.widget.CardView>
+
+
+</android.support.constraint.ConstraintLayout>

app/src/main/res/values/styles.xml

@@ -64,6 +64,7 @@
     </style>
     <style name="login_edit_style_name" parent="login_edit_style">
         <item name="android:digits">@string/digits_username</item>
+        <item name="android:background">@drawable/selector_login_edit_text</item>
     </style>
     <style name="login_edit_style_mobile" parent="login_edit_style">
         <item name="android:digits">@string/digits_mobile</item>
@@ -80,10 +81,11 @@
 
     <style name="login_theme_round_button">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">46dp</item>
-        <item name="android:background">@drawable/round_main_r25</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textSize">14sp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:paddingTop">@dimen/content_padding_16</item>
+        <item name="android:paddingBottom">@dimen/content_padding_16</item>
+        <item name="android:background">@drawable/round_main_r28</item>
+        <item name="android:textSize">18dp</item>
         <item name="android:textColor">@android:color/white</item>
     </style>
 
@@ -96,17 +98,17 @@
     </style>
 
     <style name="login_type_icon">
-        <item name="android:layout_width">40dp</item>
-        <item name="android:layout_height">40dp</item>
-        <item name="android:layout_marginBottom">4dp</item>
+        <item name="android:layout_width">46dp</item>
+        <item name="android:layout_height">46dp</item>
+        <item name="android:layout_marginBottom">12dp</item>
     </style>
 
     <style name="login_type_text">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:gravity">center</item>
-        <item name="android:textSize">12sp</item>
-        <item name="android:textColor">@color/G</item>
+        <item name="android:textSize">13dp</item>
+        <item name="android:textColor">@color/white</item>
     </style>
 
     <style name="register_type_btn">