增加不同登录、注册界面的切换

828cf2d1 · 胡学良 · 38b5cebb · 828cf2d1 · 828cf2d1 · 828cf2d1
Commit 828cf2d1 authored Mar 18, 2020 by 胡学良
6 changed files
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,7 +22,6 @@
            </intent-filter>
        </activity>
        <activity android:name=".ui.page.LoginActivity">
        </activity>
        <activity android:name=".ui.page.RegisterSuccess"></activity>
        <activity

--- a/app/src/main/java/cn/yunliyunwai/beyondclouds/ui/page/LoginActivity.java
+++ b/app/src/main/java/cn/yunliyunwai/beyondclouds/ui/page/LoginActivity.java
@@ -2,11 +2,13 @@ package cn.yunliyunwai.beyondclouds.ui.page;
 import androidx.appcompat.app.AppCompatActivity;
+import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.text.method.HideReturnsTransformationMethod;
 import android.text.method.PasswordTransformationMethod;
+import android.util.Log;
 import android.util.TypedValue;
 import android.view.View;
 import android.widget.EditText;
@@ -19,18 +21,27 @@ public class LoginActivity extends AppCompatActivity {
    private ActivityLoginBinding binding;
+    private Editable lastAccount;
+    private Editable lastMobile;
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        binding = ActivityLoginBinding.inflate(getLayoutInflater());
        setContentView(binding.getRoot());
        changeEditTextSize(binding.loginAccountEditText, binding.loginAccountBorder);
        changeEditTextSize(binding.loginPasswordEditText, binding.loginPasswordBorder);
        changeEditTextSize(binding.loginAuthCodeEditText, binding.loginAuthCodeBorder);
+        changeEditTextBorderStyle(binding.loginAccountEditText, binding.loginAccountBorder);
+        changeEditTextBorderStyle(binding.loginPasswordEditText, binding.loginPasswordBorder);
+        changeEditTextBorderStyle(binding.loginAuthCodeEditText, binding.loginAuthCodeBorder);
    }
    /**
-     * 改变用户输入前后EditText中字体的大小和边框的样式
+     * 改变用户输入前后EditText中字体的大小
     * @param editText
     * @param textView
     */
@@ -46,11 +57,9 @@ public class LoginActivity extends AppCompatActivity {
            public void onTextChanged(CharSequence s, int start, int before, int count) {
                if (s.length() == 0) {
                    hint = true;
-                    textView.setBackgroundResource(R.drawable.background_edit_text_lose_focus);
                    editText.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12);
                } else {
                    hint = false;
-                    textView.setBackgroundResource(R.drawable.background_edit_text_on_focus);
                    editText.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15);
                }
            }
@@ -63,6 +72,24 @@ public class LoginActivity extends AppCompatActivity {
    }
    /**
+     * 改变输入框获得焦点时边框的样式
+     * @param editText
+     * @param textView
+     */
+    private void changeEditTextBorderStyle(EditText editText, TextView textView) {
+        editText.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+            @Override
+            public void onFocusChange(View v, boolean hasFocus) {
+                if (hasFocus) {
+                    textView.setBackgroundResource(R.drawable.background_edit_text_on_focus);
+                } else {
+                    textView.setBackgroundResource(R.drawable.background_edit_text_lose_focus);
+                }
+            }
+        });
+    }
+    /**
     * show_password_button点击事件，显示密码与隐藏密码
     * @param view
     */
@@ -70,16 +97,76 @@ public class LoginActivity extends AppCompatActivity {
        boolean isPwdVisible = !view.isSelected();
        if (isPwdVisible) {
            view.setSelected(true);
-            binding.showPasswordButton.setText(R.string.icon_eye);
+            binding.loginShowPasswordButton.setText(R.string.icon_eye);
            HideReturnsTransformationMethod method = HideReturnsTransformationMethod.getInstance();
            binding.loginPasswordEditText.setTransformationMethod(method);
        } else {
            view.setSelected(false);
-            binding.showPasswordButton.setText(R.string.icon_eye_slash);
+            binding.loginShowPasswordButton.setText(R.string.icon_eye_slash);
            PasswordTransformationMethod method = PasswordTransformationMethod.getInstance();
            binding.loginPasswordEditText.setTransformationMethod(method);
        }
        binding.loginPasswordEditText.setSelection(binding.loginPasswordEditText.getText().toString().length());
    }
+    /**
+     * 密码登录
+     * @param view
+     */
+    @SuppressLint("WrongConstant")
+    public void passwordLogin(View view) {
+        binding.passwordLoginTitle.setTextColor(getResources().getColor(R.color.button_on_focus));
+        binding.messageLoginTitle.setTextColor(getResources().getColor(R.color.button_lose_focus));
+        if (binding.loginAccountBorderTitle.getText().toString().equals("手机号：")) {
+            lastMobile = binding.loginAccountEditText.getText();
+        }
+        binding.loginAccountBorderTitle.setText("账 号：");
+        binding.loginAccountEditText.setHint("请输入账号");
+        binding.loginAccountEditText.setText(lastAccount);
+        binding.loginAuthCodeBorder.setVisibility(8);
+        binding.loginAuthCodeBorderTitle.setVisibility(8);
+        binding.loginAuthCodeEditText.setVisibility(8);
+        binding.loginSendAuthCode.setVisibility(8);
+        binding.loginPasswordBorder.setVisibility(0);
+        binding.loginPasswordBorderTitle.setVisibility(0);
+        binding.loginPasswordEditText.setVisibility(0);
+        binding.loginShowPasswordButton.setVisibility(0);
+        binding.forgetPasswordButton.setVisibility(0);
+        binding.loginAccountEditText.clearFocus();
+    }
+    /**
+     * 短信验证码登录
+     * @param view
+     */
+    @SuppressLint("WrongConstant")
+    public void messageLogin(View view) {
+        binding.passwordLoginTitle.setTextColor(getResources().getColor(R.color.button_lose_focus));
+        binding.messageLoginTitle.setTextColor(getResources().getColor(R.color.button_on_focus));
+        if (binding.loginAccountBorderTitle.getText().toString().equals("账 号：")) {
+            lastAccount = binding.loginAccountEditText.getText();
+        }
+        binding.loginAccountBorderTitle.setText("手机号：");
+        binding.loginAccountEditText.setHint("请输入手机号");
+        binding.loginAccountEditText.setText(lastMobile);
+        binding.loginPasswordBorder.setVisibility(8);
+        binding.loginPasswordBorderTitle.setVisibility(8);
+        binding.loginPasswordEditText.setVisibility(8);
+        binding.loginShowPasswordButton.setVisibility(8);
+        binding.forgetPasswordButton.setVisibility(8);
+        binding.loginAuthCodeBorder.setVisibility(0);
+        binding.loginAuthCodeBorderTitle.setVisibility(0);
+        binding.loginAuthCodeEditText.setVisibility(0);
+        binding.loginSendAuthCode.setVisibility(0);
+        binding.loginAccountEditText.clearFocus();
+    }
 }
--- a/app/src/main/java/cn/yunliyunwai/beyondclouds/ui/page/RegisterActivity.java
+++ b/app/src/main/java/cn/yunliyunwai/beyondclouds/ui/page/RegisterActivity.java
@@ -2,6 +2,7 @@ package cn.yunliyunwai.beyondclouds.ui.page;
 import androidx.appcompat.app.AppCompatActivity;
+import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -19,6 +20,11 @@ public class RegisterActivity extends AppCompatActivity {
    private ActivityRegisterBinding binding;
+    private Editable lastMobile;
+    private Editable lastEmail;
+    @SuppressLint("WrongConstant")
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
@@ -26,13 +32,18 @@ public class RegisterActivity extends AppCompatActivity {
        binding = ActivityRegisterBinding.inflate(getLayoutInflater());
        setContentView(binding.getRoot());
-        changeEditTextSize(binding.registerMobileEditText, binding.registerMobileBorder);
+        changeEditTextSize(binding.registerAccountEditText, binding.registerAccountBorder);
        changeEditTextSize(binding.registerAuthCodeEditText, binding.registerAuthCodeBorder);
        changeEditTextSize(binding.registerPasswordEditText, binding.registerPasswordBorder);
+        changeEditTextBorderStyle(binding.registerAccountEditText, binding.registerAccountBorder);
+        changeEditTextBorderStyle(binding.registerAuthCodeEditText, binding.registerAuthCodeBorder);
+        changeEditTextBorderStyle(binding.registerPasswordEditText, binding.registerPasswordBorder);
    }
    /**
-     * 改变用户输入前后EditText中字体的大小和边框的样式
+     * 改变用户输入前后EditText中字体的大小
     * @param editText
     * @param textView
     */
@@ -48,11 +59,9 @@ public class RegisterActivity extends AppCompatActivity {
            public void onTextChanged(CharSequence s, int start, int before, int count) {
                if (s.length() == 0) {
                    hint = true;
-                    textView.setBackgroundResource(R.drawable.background_edit_text_lose_focus);
                    editText.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12);
                } else {
                    hint = false;
-                    textView.setBackgroundResource(R.drawable.background_edit_text_on_focus);
                    editText.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15);
                }
            }
@@ -65,6 +74,24 @@ public class RegisterActivity extends AppCompatActivity {
    }
    /**
+     * 改变输入框获得焦点时边框的样式
+     * @param editText
+     * @param textView
+     */
+    private void changeEditTextBorderStyle(EditText editText, TextView textView) {
+        editText.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+            @Override
+            public void onFocusChange(View v, boolean hasFocus) {
+                if (hasFocus) {
+                    textView.setBackgroundResource(R.drawable.background_edit_text_on_focus);
+                } else {
+                    textView.setBackgroundResource(R.drawable.background_edit_text_lose_focus);
+                }
+            }
+        });
+    }
+    /**
     * show_password_button点击事件，显示密码与隐藏密码
     * @param view
     */
@@ -72,16 +99,74 @@ public class RegisterActivity extends AppCompatActivity {
        boolean isPwdVisible = !view.isSelected();
        if (isPwdVisible) {
            view.setSelected(true);
-            binding.showPasswordButton.setText(R.string.icon_eye);
+            binding.registerShowPasswordButton.setText(R.string.icon_eye);
            HideReturnsTransformationMethod method = HideReturnsTransformationMethod.getInstance();
            binding.registerPasswordEditText.setTransformationMethod(method);
        } else {
            view.setSelected(false);
-            binding.showPasswordButton.setText(R.string.icon_eye_slash);
+            binding.registerShowPasswordButton.setText(R.string.icon_eye_slash);
            PasswordTransformationMethod method = PasswordTransformationMethod.getInstance();
            binding.registerPasswordEditText.setTransformationMethod(method);
        }
        binding.registerPasswordEditText.setSelection(binding.registerPasswordEditText.getText().toString().length());
    }
+    /**
+     * 手机号注册
+     * @param view
+     */
+    @SuppressLint("WrongConstant")
+    public void mobileRegister(View view) {
+        binding.mobileRegisterTitle.setTextColor(getResources().getColor(R.color.button_on_focus));
+        binding.emailRegisterTitle.setTextColor(getResources().getColor(R.color.button_lose_focus));
+        if (binding.registerAccountBorderTitle.getText().toString().equals("邮箱：")) {
+            lastEmail = binding.registerAccountEditText.getText();
+        }
+        binding.registerAccountBorderTitle.setText("手机号：");
+        binding.registerAccountEditText.setHint("请输入手机号");
+        binding.registerAccountEditText.setText(lastMobile);
+        binding.registerPasswordBorder.setVisibility(8);
+        binding.registerPasswordBorderTitle.setVisibility(8);
+        binding.registerPasswordEditText.setVisibility(8);
+        binding.registerShowPasswordButton.setVisibility(8);
+        binding.registerAuthCodeBorder.setVisibility(0);
+        binding.registerAuthCodeBorderTitle.setVisibility(0);
+        binding.registerAuthCodeEditText.setVisibility(0);
+        binding.registerSendAuthCode.setVisibility(0);
+        binding.registerAccountEditText.clearFocus();
+    }
+    /**
+     * 邮箱号注册
+     * @param view
+     */
+    @SuppressLint("WrongConstant")
+    public void emailRegister(View view) {
+        binding.mobileRegisterTitle.setTextColor(getResources().getColor(R.color.button_lose_focus));
+        binding.emailRegisterTitle.setTextColor(getResources().getColor(R.color.button_on_focus));
+        if (binding.registerAccountBorderTitle.getText().toString().equals("手机号：")) {
+            lastMobile = binding.registerAccountEditText.getText();
+        }
+        binding.registerAccountBorderTitle.setText("邮箱：");
+        binding.registerAccountEditText.setHint("请输入邮箱");
+        binding.registerAccountEditText.setText(lastEmail);
+        binding.registerPasswordBorder.setVisibility(0);
+        binding.registerPasswordBorderTitle.setVisibility(0);
+        binding.registerPasswordEditText.setVisibility(0);
+        binding.registerShowPasswordButton.setVisibility(0);
+        binding.registerAuthCodeBorder.setVisibility(8);
+        binding.registerAuthCodeBorderTitle.setVisibility(8);
+        binding.registerAuthCodeEditText.setVisibility(8);
+        binding.registerSendAuthCode.setVisibility(8);
+        binding.registerAccountEditText.clearFocus();
+    }
 }
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -8,7 +8,7 @@
    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/password_login_page"
+        android:id="@+id/login_page"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        tools:ignore="MissingConstraints">
@@ -29,21 +29,24 @@
            android:id="@+id/password_login_title"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
            android:text="密码登录"
            android:textColor="#2f2f2f"
            android:textSize="16sp"
+            android:background="@android:color/transparent"
+            android:onClick="passwordLogin"
            app:layout_constraintBottom_toBottomOf="@id/login_separator_point"
            app:layout_constraintEnd_toStartOf="@id/login_separator_point"
            app:layout_constraintTop_toTopOf="@id/login_separator_point" />
        <Button
+            android:id="@+id/message_login_title"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:background="@android:color/transparent"
            android:text="短信登陆"
            android:textColor="#999999"
            android:textSize="16sp"
+            android:onClick="messageLogin"
            app:layout_constraintBottom_toBottomOf="@id/login_separator_point"
            app:layout_constraintStart_toEndOf="@id/login_separator_point"
            app:layout_constraintTop_toTopOf="@id/login_separator_point" />
@@ -62,10 +65,10 @@
            android:id="@+id/login_account_border_title"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:layout_marginLeft="15dp"
            android:text="账 号："
            android:textColor="#999999"
            android:textSize="13sp"
+            android:layout_marginStart="15dp"
            app:layout_constraintBottom_toBottomOf="@id/login_account_border"
            app:layout_constraintStart_toStartOf="@id/login_account_border"
            app:layout_constraintTop_toTopOf="@id/login_account_border" />
@@ -73,13 +76,13 @@
        <EditText
            android:id="@+id/login_account_edit_text"
            android:layout_width="210dp"
-            android:layout_height="wrap_content"
+            android:layout_height="42dp"
-            android:layout_marginLeft="12dp"
            android:background="@android:color/transparent"
            android:hint="请输入手机号或邮箱"
-            android:singleLine="true"
-            android:textColor="#999999"
            android:textSize="12dp"
+            android:textColor="#333333"
+            android:singleLine="true"
+            android:layout_marginStart="12dp"
            app:layout_constraintBottom_toBottomOf="@id/login_account_border"
            app:layout_constraintStart_toEndOf="@id/login_account_border_title"
            app:layout_constraintTop_toTopOf="@id/login_account_border" />
@@ -98,49 +101,52 @@
            android:id="@+id/login_password_border_title"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:layout_marginLeft="15dp"
            android:text="密 码："
            android:textColor="#999999"
            android:textSize="13sp"
+            android:layout_marginStart="15dp"
            app:layout_constraintBottom_toBottomOf="@id/login_password_border"
            app:layout_constraintStart_toStartOf="@id/login_password_border"
            app:layout_constraintTop_toTopOf="@id/login_password_border" />
        <EditText
            android:id="@+id/login_password_edit_text"
-            android:layout_width="210dp"
+            android:layout_width="200dp"
-            android:layout_height="wrap_content"
+            android:layout_height="42dp"
-            android:layout_marginLeft="12dp"
            android:background="@android:color/transparent"
            android:hint="请输入密码"
+            android:textSize="12sp"
+            android:textColor="#333333"
            android:inputType="textPassword"
            android:singleLine="true"
-            android:textColor="#999999"
+            android:layout_marginStart="12dp"
-            android:textSize="12sp"
            app:layout_constraintBottom_toBottomOf="@id/login_password_border"
            app:layout_constraintStart_toEndOf="@id/login_password_border_title"
            app:layout_constraintTop_toTopOf="@id/login_password_border" />
        <cn.yunliyunwai.beyondclouds.view.BeyondTextIcon
-            android:id="@+id/show_password_button"
+            android:id="@+id/login_show_password_button"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginEnd="14dp"
-            android:onClick="setPswVisible"
            android:text="@string/icon_eye_slash"
            android:textSize="14dp"
+            android:onClick="setPswVisible"
            app:layout_constraintBottom_toBottomOf="@id/login_password_border"
            app:layout_constraintEnd_toEndOf="@id/login_password_border"
            app:layout_constraintTop_toTopOf="@id/login_password_border" />
        <Button
-            android:layout_width="58dp"
+            android:id="@+id/forget_password_button"
-            android:layout_height="17dp"
+            android:layout_width="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
            android:text="忘记密码"
            android:textColor="#999999"
            android:textSize="13sp"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
+            android:layout_marginTop="8dp"
+            android:background="@android:color/transparent"
            app:layout_constraintEnd_toEndOf="@id/login_right_guide_line"
            app:layout_constraintTop_toBottomOf="@id/login_password_border" />
@@ -150,6 +156,7 @@
            android:layout_width="314dp"
            android:layout_height="42dp"
            android:layout_marginTop="32dp"
+            android:visibility="gone"
            android:background="@drawable/background_edit_text_lose_focus"
            app:layout_constraintEnd_toEndOf="@id/login_right_guide_line"
            app:layout_constraintStart_toStartOf="@id/login_left_guide_line"
@@ -159,10 +166,11 @@
            android:id="@+id/login_auth_code_border_title"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:layout_marginLeft="15dp"
            android:text="验证码："
            android:textColor="#999999"
            android:textSize="13sp"
+            android:layout_marginStart="15dp"
+            android:visibility="gone"
            app:layout_constraintBottom_toBottomOf="@id/login_auth_code_border"
            app:layout_constraintStart_toStartOf="@id/login_auth_code_border"
            app:layout_constraintTop_toTopOf="@id/login_auth_code_border" />
@@ -170,25 +178,27 @@
        <EditText
            android:id="@+id/login_auth_code_edit_text"
            android:layout_width="140dp"
-            android:layout_height="wrap_content"
+            android:layout_height="42dp"
-            android:layout_marginLeft="12dp"
-            android:background="@android:color/transparent"
            android:hint="请输入验证码"
-            android:inputType="textPassword"
-            android:singleLine="true"
-            android:textColor="#999999"
            android:textSize="12sp"
+            android:textColor="#333333"
+            android:singleLine="true"
+            android:background="@android:color/transparent"
+            android:layout_marginStart="12dp"
+            android:visibility="gone"
            app:layout_constraintBottom_toBottomOf="@id/login_auth_code_border"
            app:layout_constraintStart_toEndOf="@id/login_auth_code_border_title"
            app:layout_constraintTop_toTopOf="@id/login_auth_code_border" />
        <Button
+            android:id="@+id/login_send_auth_code"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="发送验证码"
            android:textSize="13sp"
            android:textColor="#75d098"
            android:background="@android:color/transparent"
+            android:visibility="gone"
            app:layout_constraintTop_toTopOf="@id/login_auth_code_border"
            app:layout_constraintBottom_toBottomOf="@id/login_auth_code_border"
            app:layout_constraintEnd_toEndOf="@id/login_auth_code_border" />
@@ -197,12 +207,12 @@
            android:id="@+id/login_button"
            android:layout_width="314dp"
            android:layout_height="42dp"
-            android:layout_marginTop="52dp"
-            android:background="@drawable/background_login_button"
-            android:stateListAnimator="@null"
            android:text="登录"
            android:textColor="#ffffff"
            android:textSize="15sp"
+            android:layout_marginTop="52dp"
+            android:background="@drawable/background_login_button"
+            android:stateListAnimator="@null"
            app:layout_constraintEnd_toEndOf="@id/login_right_guide_line"
            app:layout_constraintStart_toStartOf="@id/login_left_guide_line"
            app:layout_constraintTop_toBottomOf="@id/login_auth_code_border" />
@@ -229,13 +239,14 @@
            <Button
                android:id="@+id/account_not_exist_register_button"
-                android:layout_width="50dp"
+                android:layout_width="wrap_content"
-                android:layout_height="18dp"
+                android:layout_height="wrap_content"
-                android:layout_marginLeft="0dp"
-                android:background="@android:color/transparent"
                android:text="去注册"
                android:textColor="#00aae6"
                android:textSize="13sp"
+                android:minWidth="0dp"
+                android:minHeight="0dp"
+                android:background="@android:color/transparent"
                app:layout_constraintStart_toEndOf="@id/account_not_exist_text"
                tools:ignore="MissingConstraints" />
@@ -260,8 +271,8 @@
        android:id="@+id/third_party_login_area"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
+        android:layout_marginTop="60dp"
-        app:layout_constraintTop_toBottomOf="@id/password_login_page"
+        app:layout_constraintTop_toBottomOf="@id/login_page"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintEnd_toEndOf="parent">

--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -7,7 +7,7 @@
    tools:context=".ui.page.RegisterActivity">
    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/mobile_register_page"
+        android:id="@+id/register_page"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        tools:ignore="MissingConstraints">
@@ -33,6 +33,7 @@
            android:textColor="#2f2f2f"
            android:textSize="16sp"
            android:layout_marginEnd="5dp"
+            android:onClick="mobileRegister"
            app:layout_constraintBottom_toBottomOf="@id/register_separator_point"
            app:layout_constraintEnd_toStartOf="@id/register_separator_point"
            app:layout_constraintTop_toTopOf="@id/register_separator_point" />
@@ -41,17 +42,18 @@
            android:id="@+id/email_register_title"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
            android:text="邮箱号注册"
            android:textColor="#999999"
            android:textSize="16sp"
            android:layout_marginStart="5dp"
+            android:onClick="emailRegister"
+            android:background="@android:color/transparent"
            app:layout_constraintBottom_toBottomOf="@id/register_separator_point"
            app:layout_constraintStart_toEndOf="@id/register_separator_point"
            app:layout_constraintTop_toTopOf="@id/register_separator_point" />
        <TextView
-            android:id="@+id/register_mobile_border"
+            android:id="@+id/register_account_border"
            android:layout_width="314dp"
            android:layout_height="42dp"
            android:layout_marginTop="28dp"
@@ -61,29 +63,30 @@
            app:layout_constraintTop_toBottomOf="@id/mobile_register_title" />
        <TextView
-            android:id="@+id/register_mobile_border_title"
+            android:id="@+id/register_account_border_title"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="手机号："
            android:textSize="13sp"
            android:textColor="#999999"
-            android:layout_marginLeft="15dp"
+            android:layout_marginStart="15dp"
-            app:layout_constraintTop_toTopOf="@id/register_mobile_border"
+            app:layout_constraintTop_toTopOf="@id/register_account_border"
-            app:layout_constraintBottom_toBottomOf="@id/register_mobile_border"
+            app:layout_constraintBottom_toBottomOf="@id/register_account_border"
-            app:layout_constraintStart_toStartOf="@id/register_mobile_border" />
+            app:layout_constraintStart_toStartOf="@id/register_account_border" />
        <EditText
-            android:id="@+id/register_mobile_edit_text"
+            android:id="@+id/register_account_edit_text"
            android:layout_width="210dp"
-            android:layout_height="wrap_content"
+            android:layout_height="42dp"
-            android:layout_marginLeft="12dp"
-            android:background="@android:color/transparent"
            android:hint="请输入手机号"
            android:textSize="12sp"
+            android:textColor="#333333"
            android:singleLine="true"
-            app:layout_constraintBottom_toBottomOf="@id/register_mobile_border"
+            android:layout_marginStart="12dp"
-            app:layout_constraintStart_toEndOf="@id/register_mobile_border_title"
+            android:background="@android:color/transparent"
-            app:layout_constraintTop_toTopOf="@id/register_mobile_border" />
+            app:layout_constraintBottom_toBottomOf="@id/register_account_border"
+            app:layout_constraintStart_toEndOf="@id/register_account_border_title"
+            app:layout_constraintTop_toTopOf="@id/register_account_border" />
        <TextView
            android:id="@+id/register_auth_code_border"
@@ -93,7 +96,7 @@
            android:background="@drawable/background_edit_text_lose_focus"
            app:layout_constraintStart_toStartOf="@id/register_left_guide_line"
            app:layout_constraintEnd_toEndOf="@id/register_right_guide_line"
-            app:layout_constraintTop_toBottomOf="@id/register_mobile_border" />
+            app:layout_constraintTop_toBottomOf="@id/register_account_border" />
        <TextView
            android:id="@+id/register_auth_code_border_title"
@@ -102,7 +105,7 @@
            android:text="验证码："
            android:textSize="13sp"
            android:textColor="#999999"
-            android:layout_marginLeft="15dp"
+            android:layout_marginStart="15dp"
            app:layout_constraintTop_toTopOf="@id/register_auth_code_border"
            app:layout_constraintBottom_toBottomOf="@id/register_auth_code_border"
            app:layout_constraintStart_toStartOf="@id/register_auth_code_border" />
@@ -110,22 +113,25 @@
        <EditText
            android:id="@+id/register_auth_code_edit_text"
            android:layout_width="140dp"
-            android:layout_height="wrap_content"
+            android:layout_height="42dp"
            android:hint="请输入验证码"
            android:textSize="12sp"
+            android:textColor="#333333"
            android:singleLine="true"
-            android:layout_marginLeft="12dp"
+            android:layout_marginStart="12dp"
            android:background="@android:color/transparent"
            app:layout_constraintTop_toTopOf="@id/register_auth_code_border"
            app:layout_constraintBottom_toBottomOf="@id/register_auth_code_border"
            app:layout_constraintStart_toEndOf="@id/register_auth_code_border_title" />
-        <TextView
+        <Button
+            android:id="@+id/register_send_auth_code"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:text="12s"
+            android:text="发送验证码"
            android:textSize="13sp"
-            android:layout_marginEnd="12dp"
+            android:textColor="#75d098"
+            android:background="@android:color/transparent"
            app:layout_constraintTop_toTopOf="@id/register_auth_code_border"
            app:layout_constraintBottom_toBottomOf="@id/register_auth_code_border"
            app:layout_constraintEnd_toEndOf="@id/register_auth_code_border" />
@@ -135,8 +141,8 @@
            android:layout_width="314dp"
            android:layout_height="42dp"
            android:layout_marginTop="32dp"
-            android:onClick="setPswVisible"
            android:background="@drawable/background_edit_text_lose_focus"
+            android:visibility="gone"
            app:layout_constraintEnd_toEndOf="@id/register_right_guide_line"
            app:layout_constraintStart_toStartOf="@id/register_left_guide_line"
            app:layout_constraintTop_toBottomOf="@id/register_auth_code_border" />
@@ -145,36 +151,40 @@
            android:id="@+id/register_password_border_title"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:layout_marginLeft="15dp"
            android:text="密 码："
            android:textColor="#999999"
            android:textSize="13sp"
+            android:layout_marginStart="15dp"
+            android:visibility="gone"
            app:layout_constraintBottom_toBottomOf="@id/register_password_border"
            app:layout_constraintStart_toStartOf="@id/register_password_border"
            app:layout_constraintTop_toTopOf="@id/register_password_border" />
        <EditText
            android:id="@+id/register_password_edit_text"
-            android:layout_width="210dp"
+            android:layout_width="200dp"
-            android:layout_height="wrap_content"
+            android:layout_height="42dp"
-            android:layout_marginLeft="12dp"
            android:background="@android:color/transparent"
            android:hint="请输入密码"
            android:inputType="textPassword"
            android:singleLine="true"
-            android:textColor="#999999"
+            android:textColor="#333333"
            android:textSize="12sp"
+            android:layout_marginStart="12dp"
+            android:visibility="gone"
            app:layout_constraintBottom_toBottomOf="@id/register_password_border"
            app:layout_constraintStart_toEndOf="@id/register_password_border_title"
            app:layout_constraintTop_toTopOf="@id/register_password_border" />
        <cn.yunliyunwai.beyondclouds.view.BeyondTextIcon
-            android:id="@+id/show_password_button"
+            android:id="@+id/register_show_password_button"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginEnd="14dp"
            android:text="@string/icon_eye_slash"
            android:textSize="14dp"
+            android:onClick="setPswVisible"
+            android:visibility="gone"
            app:layout_constraintBottom_toBottomOf="@id/register_password_border"
            app:layout_constraintEnd_toEndOf="@id/register_password_border"
            app:layout_constraintTop_toTopOf="@id/register_password_border" />
@@ -207,7 +217,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text="注册即表示同意"
-                android:textSize="14dp"
+                android:textSize="13sp"
                android:textColor="#999999"
                app:layout_constraintTop_toTopOf="@id/register_user_agreement"
                app:layout_constraintBottom_toBottomOf="@id/register_user_agreement"
@@ -220,7 +230,7 @@
                android:text="《用户协议》"
                android:minWidth="0dp"
                android:minHeight="0dp"
-                android:textSize="14sp"
+                android:textSize="13sp"
                android:textColor="#00aae6"
                android:background="@android:color/transparent"
                app:layout_constraintStart_toEndOf="@id/register_instruction_text"
@@ -230,7 +240,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text="和"
-                android:textSize="14sp"
+                android:textSize="13sp"
                android:textColor="#999999"
                app:layout_constraintStart_toEndOf="@id/register_user_agreement"
                tools:ignore="MissingConstraints" />
@@ -239,12 +249,12 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text="《隐私政策》"
-                android:background="@android:color/transparent"
+                android:textSize="13sp"
-                android:textSize="14sp"
                android:textColor="#00aae6"
                android:layout_marginStart="14dp"
                android:minHeight="0dp"
                android:minWidth="0dp"
+                android:background="@android:color/transparent"
                app:layout_constraintStart_toEndOf="@id/register_user_agreement"
                tools:ignore="MissingConstraints" />
@@ -270,8 +280,8 @@
        android:id="@+id/third_party_login_area"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
+        android:layout_marginTop="60dp"
-        app:layout_constraintTop_toBottomOf="@id/mobile_register_page"
+        app:layout_constraintTop_toBottomOf="@id/register_page"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintEnd_toEndOf="parent">
@@ -283,7 +293,6 @@
            android:textColor="#bec7cb"
            android:textSize="14sp"
            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.498"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent" />

--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -13,4 +13,6 @@
    <color name="colorGray">#666666</color>
    <color name="colorTextAccent">#333333</color>
    <color name="colorBackgroundTopicTouched">#3000AAE6</color>
+    <color name="button_on_focus">#2f2f2f</color>
+    <color name="button_lose_focus">#999999</color>
 </resources>