登录UI修改

app/src/main/java/com/nnbc123/app/base/BaseLoginAct.java

@@ -61,9 +61,7 @@ public abstract class BaseLoginAct extends BaseActivity {
         int privacyAgreementTipIndex = privacyAgreementDescTip.indexOf(privacyAgreementTip);
         int userAgreementTipIndex = privacyAgreementDescTip.indexOf(userAgreementTip);
 
-
+        ss.setSpan(new OriginalDrawStatusClickSpan(ContextCompat.getColor(context, R.color.text_normal_282828)) {
-        ss.setSpan(new ForegroundColorSpan(ContextCompat.getColor(context, R.color.color_2D93FF)), privacyAgreementTipIndex, privacyAgreementTipIndex + privacyAgreementTip.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
-        ss.setSpan(new OriginalDrawStatusClickSpan(ContextCompat.getColor(context, R.color.color_2D93FF)) {
             @Override
             public void onClick(@NonNull View widget) {
                 if (!canClick) {
@@ -75,8 +73,8 @@ public abstract class BaseLoginAct extends BaseActivity {
                 CommonWebViewActivity.start(context, UriProvider.getPrivacyAgreement());
             }
         }, privacyAgreementTipIndex, privacyAgreementTipIndex + privacyAgreementTip.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
-        ss.setSpan(new ForegroundColorSpan(ContextCompat.getColor(context, R.color.color_2D93FF)), userAgreementTipIndex, userAgreementTipIndex + userAgreementTip.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+
-        ss.setSpan(new OriginalDrawStatusClickSpan(ContextCompat.getColor(context, R.color.color_2D93FF)) {
+        ss.setSpan(new OriginalDrawStatusClickSpan(ContextCompat.getColor(context, R.color.text_normal_282828)) {
             @Override
             public void onClick(@NonNull View widget) {
                 if (!canClick) {

app/src/main/java/com/nnbc123/app/home/widget/AnchorCardView.kt

@@ -50,7 +50,7 @@ class AnchorCardView @JvmOverloads constructor(
     private var audioPlaying = false
     private var anchorInfo: AnchorInfo? = null
     private var mVibrator: Vibrator? = null
-    private val patter = longArrayOf(0, 1000, 2500)
+    private val patter = longArrayOf(0, 500)
     private var count: Long = 10
 
     private fun initView() {

app/src/main/java/com/nnbc123/app/ui/login/BindCodeActivity.java

@@ -5,23 +5,25 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.Editable;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
+import android.text.TextWatcher;
 import android.text.style.ForegroundColorSpan;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.WindowManager;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
 import androidx.core.content.ContextCompat;
 
 import com.coorchice.library.utils.LogUtils;
-import com.trello.rxlifecycle3.android.ActivityEvent;
+import com.google.android.material.textfield.TextInputEditText;
 import com.nnbc123.app.R;
 import com.nnbc123.app.base.BaseLoginAct;
-import com.nnbc123.app.ui.login.ui.CodeEditText;
 import com.nnbc123.core.auth.AuthModel;
 import com.nnbc123.core.auth.exception.BanAccountException;
 import com.nnbc123.core.auth.exception.IsSuperAdminException;
@@ -30,6 +32,8 @@ import com.nnbc123.core.statistic.StatisticManager;
 import com.nnbc123.core.statistic.protocol.StatisticsProtocol;
 import com.nnbc123.core.user.UserModel;
 import com.nnbc123.core.user.event.NeedCompleteInfoEvent;
+import com.nnbc123.library.utils.TextWatcherWrapper;
+import com.trello.rxlifecycle3.android.ActivityEvent;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -50,12 +54,17 @@ import io.reactivex.disposables.Disposable;
  */
 public class BindCodeActivity extends BaseLoginAct {
 
-    private static final String TYPE_SMS = "1";
+    private TextInputEditText codeEt;
-    private CodeEditText codeEt;
     private TextView tvGetCode, tvDesc, tvSecond;
     private String mPhone;
-    private boolean isSuperAdmin = false;
     private CodeDownDescTimer timer;
+    private Button btnNext;
+    private final TextWatcher textWatcher = new TextWatcherWrapper() {
+        @Override
+        public void afterTextChanged(Editable s) {
+            checkInput();
+        }
+    };
 
     public static void start(Context context, String phone) {
         Intent intent = new Intent(context, BindCodeActivity.class);
@@ -97,15 +106,18 @@ public class BindCodeActivity extends BaseLoginAct {
         tvGetCode = findViewById(R.id.tv_get_code);
         tvDesc = findViewById(R.id.tv_desc);
         tvSecond = findViewById(R.id.tv_second);
+        btnNext = findViewById(R.id.btn_next);
+    }
+
+    private void checkInput() {
+        btnNext.setEnabled(!TextUtils.isEmpty(codeEt.getText()) && codeEt.getText().toString().length() == 5);
     }
 
     private void onSetListener() {
-        codeEt.setOnTextFinishListener(new CodeEditText.OnTextFinishListener() {
+
-            @Override
+        btnNext.setOnClickListener(v -> bindPhone());
-            public void onTextFinish(CharSequence text, int length) {
+        btnNext.setEnabled(false);
-                bindPhone();
+        codeEt.addTextChangedListener(textWatcher);
-            }
-        });
 
         tvGetCode.setOnClickListener(v -> {
             getSmsCode();
@@ -190,7 +202,6 @@ public class BindCodeActivity extends BaseLoginAct {
             StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_LOGIN_FAILED_CLICK, eventLabel.toString());
         }
         if (e instanceof BanAccountException) {
-            isSuperAdmin = false;
             BanAccountException exception = (BanAccountException) e;
             String text = "您的账号因" + exception.getMessage() + "被封禁\n解封时间：";
             int start = text.length();
@@ -204,7 +215,6 @@ public class BindCodeActivity extends BaseLoginAct {
         } else if (e instanceof IOException) {
             toast("网络异常,请检查您的网络再试~");
         } else {
-            isSuperAdmin = false;
             toast(e.getMessage());
         }
     }

app/src/main/java/com/nnbc123/app/ui/login/CodeDownDescTimer.java

@@ -34,11 +34,13 @@ public class CodeDownDescTimer extends CountDownTimer {
         mTvSecond.setText(millisUntilFinished / 1000 + "s");  //设置倒计时时间
         tvGetCode.setClickable(false); //设置不可点击
         tvGetCode.setText("后可重新获取验证码");
+        tvGetCode.setVisibility(View.GONE);
     }
 
     @Override
     public void onFinish() {
         mTvSecond.setVisibility(View.GONE);
+        tvGetCode.setVisibility(View.VISIBLE);
         tvGetCode.setText("重新获取验证码");
         tvGetCode.setClickable(true);//重新获得点击
     }

app/src/main/java/com/nnbc123/app/ui/login/LoginCodeActivity.java

@@ -5,24 +5,26 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.Editable;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
+import android.text.TextWatcher;
 import android.text.style.ForegroundColorSpan;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.WindowManager;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
 import androidx.core.content.ContextCompat;
 
 import com.coorchice.library.utils.LogUtils;
+import com.google.android.material.textfield.TextInputEditText;
 import com.netease.nim.uikit.StatusBarUtil;
-import com.trello.rxlifecycle3.android.ActivityEvent;
 import com.nnbc123.app.R;
 import com.nnbc123.app.base.BaseLoginAct;
-import com.nnbc123.app.ui.login.ui.CodeEditText;
 import com.nnbc123.core.auth.AuthModel;
 import com.nnbc123.core.auth.event.LoginEvent;
 import com.nnbc123.core.auth.exception.AccountCancelException;
@@ -31,6 +33,8 @@ import com.nnbc123.core.auth.exception.IsSuperAdminException;
 import com.nnbc123.core.code.CodeType;
 import com.nnbc123.core.statistic.StatisticManager;
 import com.nnbc123.core.statistic.protocol.StatisticsProtocol;
+import com.nnbc123.library.utils.TextWatcherWrapper;
+import com.trello.rxlifecycle3.android.ActivityEvent;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -51,12 +55,16 @@ import io.reactivex.disposables.Disposable;
  */
 public class LoginCodeActivity extends BaseLoginAct {
 
-    private static final String TAG = "LoginVertificationActivity";
+    private TextInputEditText codeEt;
-    private static final String TYPE_SMS = "1";
-    private CodeEditText codeEt;
     private TextView tvGetCode, tvDesc, tvSecond;
     private String mPhone;
-    private boolean isSuperAdmin = false;
+    private Button btnNext;
+    private final TextWatcher textWatcher = new TextWatcherWrapper() {
+        @Override
+        public void afterTextChanged(Editable s) {
+            checkInput();
+        }
+    };
     private CodeDownDescTimer timer;
 
     public static void start(Context context, String phone) {
@@ -108,11 +116,18 @@ public class LoginCodeActivity extends BaseLoginAct {
         tvGetCode = findViewById(R.id.tv_get_code);
         tvDesc = findViewById(R.id.tv_desc);
         tvSecond = findViewById(R.id.tv_second);
+        btnNext = findViewById(R.id.btn_next);
+    }
+
+    private void checkInput() {
+        btnNext.setEnabled(!TextUtils.isEmpty(codeEt.getText()) && codeEt.getText().toString().length() == 5);
     }
 
     private void onSetListener() {
 
-        codeEt.setOnTextFinishListener((text, length) -> login());
+        btnNext.setOnClickListener(v -> login());
+        btnNext.setEnabled(false);
+        codeEt.addTextChangedListener(textWatcher);
 
         tvGetCode.setOnClickListener(v -> getSmsCode());
 
@@ -229,7 +244,6 @@ public class LoginCodeActivity extends BaseLoginAct {
             StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_LOGIN_FAILED_CLICK, eventLabel.toString());
         }
         if (e instanceof BanAccountException) {
-            isSuperAdmin = false;
             BanAccountException exception = (BanAccountException) e;
             String text = "您的账号因" + exception.getMessage() + "被封禁\n解封时间：";
             int start = text.length();
@@ -255,7 +269,6 @@ public class LoginCodeActivity extends BaseLoginAct {
         } else if (e instanceof IOException) {
             toast("网络异常,请检查您的网络再试~");
         } else {
-            isSuperAdmin = false;
             toast(e.getMessage());
         }
     }

app/src/main/java/com/nnbc123/app/ui/login/LoginPhoneActivity.java

@@ -38,7 +38,7 @@ public class LoginPhoneActivity extends BaseActivity implements View.OnClickList
     private ImageView ivBack;
 
     private AccountValidator accountValidator = new AccountValidator();
-    private TextWatcher textWatcher = new TextWatcherWrapper() {
+    private final TextWatcher textWatcher = new TextWatcherWrapper() {
         @Override
         public void afterTextChanged(Editable s) {
             checkInput();

app/src/main/res/color/color_selector_282828_false_878b9c.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:color="@color/text_normal_282828" android:state_enabled="true" />
+
+    <item android:color="@color/text_secondary_878b9c" />
+
+</selector>

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

@@ -4,8 +4,8 @@
 
     <gradient
         android:angle="180"
-        android:endColor="#5FCCE4"
+        android:endColor="@color/color_218eff"
-        android:startColor="#5FCCE4"
+        android:startColor="@color/color_7727e4"
         android:type="linear"
         android:useLevel="true" />
     <corners android:radius="100dp" />

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

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/bg_disable_303043" />
+    <solid android:color="@color/bg_disable_f2f3f6" />
 
     <corners android:radius="100dp" />
 

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

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/bg_disable_303043" />
+    <solid android:color="@color/bg_disable_f2f3f6" />
 
 
     <corners android:radius="100dp" />

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

@@ -2,8 +2,10 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/bg_edit_e8e8f6" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/text_normal_282828" />
 
-    <corners android:radius="100dp" />
+    <corners android:radius="@dimen/dp_100" />
 
-</shape>
+</shape>

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

@@ -10,7 +10,7 @@
 
     <item >
         <shape android:shape="rectangle">
-            <solid android:color="@color/bg_disable_303043" />
+            <solid android:color="@color/bg_disable_f2f3f6" />
             <corners android:radius="20dp" />
         </shape>
     </item>

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

@@ -11,7 +11,7 @@
 
     <item >
         <shape android:shape="rectangle">
-            <solid android:color="@color/bg_disable_303043" />
+            <solid android:color="@color/bg_disable_f2f3f6" />
             <corners android:radius="20dp" />
         </shape>
     </item>

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

@@ -4,70 +4,105 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_normal_1c1b22">
+    android:background="@color/white">
+
+    <ImageView
+        android:id="@+id/iv_logo"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:src="@drawable/bg_login_top"
+        app:layout_constraintDimensionRatio="750:726"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/view_top_guile_line"
+        android:layout_width="0dp"
+        android:layout_height="1px"
+        android:layout_marginBottom="34dp"
+        app:layout_constraintBottom_toBottomOf="@id/iv_logo"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <ImageView
         android:id="@+id/iv_back"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_30"
+        android:layout_marginTop="@dimen/dp_35"
         android:padding="@dimen/dp_17"
         android:src="@drawable/arrow_left"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/tv_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="170dp"
-        android:text="填写验证码"
-        android:textColor="@color/text_title_282828"
-        android:textSize="@dimen/text_size_18"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <TextView
         android:id="@+id/tv_desc"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp_5"
-        android:text="验证码已发送"
+        android:gravity="center"
-        android:textColor="@color/text_normal_282828"
+        android:text="验证码已发送\n+86 15565758987"
-        android:textSize="@dimen/sp_11"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_20"
+        app:layout_constraintBottom_toBottomOf="@id/iv_logo"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_title" />
+        app:layout_constraintTop_toTopOf="parent" />
 
-    <com.nnbc123.app.ui.login.ui.CodeEditText
+    <LinearLayout
-        android:id="@+id/et_code"
+        android:id="@+id/ll_password"
-        android:layout_width="wrap_content"
+        android:layout_width="275dp"
-        android:layout_height="wrap_content"
+        android:layout_height="50dp"
-        android:layout_marginTop="30dp"
+        android:background="@drawable/bg_common_edit"
-        android:focusable="true"
+        android:baselineAligned="true"
-        android:inputType="number"
-        android:textColor="@color/text_title_282828"
-        android:textSize="@dimen/sp_18"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tv_desc"
+        app:layout_constraintTop_toBottomOf="@+id/view_top_guile_line">
-        app:strokeBackground="@drawable/bg_secondary_radius_10"
+
-        app:strokeHeight="@dimen/dp_45"
+        <com.google.android.material.textfield.TextInputEditText
-        app:strokeLength="5"
+            android:id="@+id/et_code"
-        app:strokePadding="@dimen/dp_10"
+            android:layout_width="match_parent"
-        app:strokeWidth="@dimen/dp_45" />
+            android:layout_height="33dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="21dp"
+            android:layout_marginEnd="21dp"
+            android:background="@null"
+            android:focusable="true"
+            android:gravity="center_vertical"
+            android:hint="请输入验证码"
+            android:inputType="textPassword"
+            android:maxLength="5"
+            android:textColor="@color/text_title_282828"
+            android:textColorHint="@color/color_bdbfd0"
+            android:textSize="@dimen/dp_15"
+            tools:ignore="SpUsage" />
+
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/btn_next"
+        android:layout_width="275dp"
+        android:layout_height="50dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="20dp"
+        android:background="@drawable/bg_common_confirm"
+        android:enabled="false"
+        android:gravity="center"
+        android:text="验证"
+        android:textColor="@color/color_selector_282828_false_878b9c"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/ll_password" />
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="18dp"
         android:gravity="center"
-        android:layout_marginTop="@dimen/dp_5"
         android:orientation="horizontal"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="@id/ll_password"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="@id/ll_password"
-        app:layout_constraintTop_toBottomOf="@id/et_code">
+        app:layout_constraintTop_toTopOf="@id/ll_password">
 
         <TextView
             android:id="@+id/tv_second"
@@ -75,9 +110,9 @@
             android:layout_height="wrap_content"
             android:includeFontPadding="false"
             android:text="60s"
-            android:typeface="monospace"
+            android:textColor="@color/color_bdbfd0"
-            android:textColor="@color/app_248cfe"
             android:textSize="@dimen/sp_15"
+            android:typeface="monospace"
             android:visibility="gone"
             tools:visibility="visible" />
 
@@ -89,10 +124,7 @@
             android:paddingBottom="@dimen/dp_10"
             android:textColor="@color/text_normal_282828"
             android:textSize="@dimen/sp_11"
-            tools:text="重新获取验证码"
+            tools:text="重新获取" />
-
-
-            />
 
     </LinearLayout>
 

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

@@ -4,24 +4,42 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_normal_1c1b22">
+    android:background="@color/white">
+
+    <ImageView
+        android:id="@+id/iv_logo"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:src="@drawable/bg_login_top"
+        app:layout_constraintDimensionRatio="750:726"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/view_top_guile_line"
+        android:layout_width="0dp"
+        android:layout_height="1px"
+        android:layout_marginBottom="34dp"
+        app:layout_constraintBottom_toBottomOf="@id/iv_logo"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <ImageView
         android:id="@+id/iv_back"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_30"
+        android:layout_marginTop="@dimen/dp_35"
         android:padding="@dimen/dp_17"
         android:src="@drawable/arrow_left"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-
     <TextView
         android:id="@+id/tv_code_login"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="75dp"
+        android:layout_marginTop="56dp"
         android:layout_marginEnd="@dimen/dp_15"
         android:text="验证码登录"
         android:textColor="@color/text_title_282828"
@@ -30,59 +48,53 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/tv_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="140dp"
-        android:text="你的手机号是多少"
-        android:textColor="@color/text_title_282828"
-        android:textSize="@dimen/text_size_18"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <LinearLayout
         android:id="@+id/ll_account"
-        android:layout_width="270dp"
+        android:layout_width="275dp"
-        android:layout_height="45dp"
+        android:layout_height="50dp"
-        android:layout_marginTop="70dp"
         android:background="@drawable/bg_common_edit"
         android:baselineAligned="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tv_title">
+        app:layout_constraintTop_toBottomOf="@+id/view_top_guile_line">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:gravity="center_vertical"
             android:paddingStart="@dimen/dp_15"
-            android:paddingEnd="@dimen/dp_15"
+            android:paddingEnd="@dimen/dp_12"
             android:text="+86"
             android:textColor="@color/text_title_282828"
             android:textSize="@dimen/sp_15" />
 
+        <View
+            android:layout_width="1px"
+            android:layout_height="25dp"
+            android:background="@color/bg_disable_f2f3f6" />
+
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/et_account"
             android:layout_width="match_parent"
             android:layout_height="33dp"
+            android:layout_marginStart="12dp"
             android:background="@null"
             android:focusable="true"
             android:gravity="center_vertical"
+            android:hint="请输入手机号码"
             android:inputType="number"
             android:maxLength="11"
             android:textColor="@color/text_title_282828"
+            android:textColorHint="@color/color_bdbfd0"
             android:textSize="@dimen/dp_15"
-            tools:ignore="SpUsage"
+            tools:ignore="SpUsage" />
-            tools:text="123456" />
+
     </LinearLayout>
 
     <LinearLayout
         android:id="@+id/ll_password"
-        android:layout_width="270dp"
+        android:layout_width="275dp"
-        android:layout_height="45dp"
+        android:layout_height="50dp"
         android:layout_marginTop="15dp"
         android:background="@drawable/bg_common_edit"
         android:baselineAligned="true"
@@ -90,53 +102,48 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/ll_account">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:paddingStart="@dimen/dp_15"
-            android:paddingEnd="@dimen/dp_15"
-            android:text="密码"
-            android:textColor="@color/text_title_282828"
-            android:textSize="@dimen/sp_15" />
-
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/et_password"
             android:layout_width="match_parent"
             android:layout_height="33dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="21dp"
+            android:layout_marginEnd="21dp"
             android:background="@null"
             android:focusable="true"
             android:gravity="center_vertical"
+            android:hint="密码"
             android:inputType="textPassword"
             android:maxLength="16"
             android:textColor="@color/text_title_282828"
+            android:textColorHint="@color/color_bdbfd0"
             android:textSize="@dimen/dp_15"
             tools:ignore="SpUsage" />
+
     </LinearLayout>
 
     <TextView
         android:id="@+id/tv_forget_password"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_15"
+        android:layout_marginTop="@dimen/dp_10"
-        android:layout_marginEnd="75dp"
+        android:text="忘记密码?"
-        android:text="忘记密码"
+        android:textColor="@color/text_secondary_878b9c"
-        android:textColor="@color/text_title_282828"
         android:textSize="@dimen/sp_14"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toEndOf="@id/ll_password"
         app:layout_constraintTop_toBottomOf="@id/ll_password" />
 
     <Button
         android:id="@+id/btn_next"
-        android:layout_width="270dp"
+        android:layout_width="275dp"
-        android:layout_height="@dimen/dp_45"
+        android:layout_height="50dp"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="20dp"
         android:background="@drawable/bg_common_confirm"
         android:enabled="false"
         android:gravity="center"
         android:text="下一步"
-        android:textColor="@color/white"
+        android:textColor="@color/color_selector_282828_false_878b9c"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tv_forget_password" />

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

@@ -4,66 +4,58 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_normal_1c1b22">
+    android:background="@color/white">
+
+    <ImageView
+        android:id="@+id/iv_logo"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:src="@drawable/bg_login_top"
+        app:layout_constraintDimensionRatio="750:726"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/view_top_guile_line"
+        android:layout_width="0dp"
+        android:layout_height="1px"
+        android:layout_marginBottom="34dp"
+        app:layout_constraintBottom_toBottomOf="@id/iv_logo"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <ImageView
         android:id="@+id/iv_back"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_30"
+        android:layout_marginTop="35dp"
         android:padding="@dimen/dp_17"
         android:src="@drawable/arrow_left"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-
     <TextView
         android:id="@+id/tv_password_login"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="75dp"
+        android:layout_marginTop="56dp"
         android:layout_marginEnd="@dimen/dp_15"
         android:text="密码登录"
-        android:textColor="@color/text_secondary_878b9c"
+        android:textColor="@color/text_normal_282828"
         android:textSize="@dimen/sp_15"
-        android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/tv_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="140dp"
-        android:text="你的手机号是多少"
-        android:textColor="@color/text_title_282828"
-        android:textSize="@dimen/text_size_18"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_5"
-        android:text="未注册手机号自动登录"
-        android:textColor="@color/text_secondary_878b9c"
-        android:textSize="11sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_title" />
-
     <LinearLayout
         android:id="@+id/ll_account"
-        android:layout_width="270dp"
+        android:layout_width="275dp"
-        android:layout_height="45dp"
+        android:layout_height="50dp"
-        android:layout_marginTop="70dp"
         android:background="@drawable/bg_common_edit"
         android:baselineAligned="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tv_title">
+        app:layout_constraintTop_toBottomOf="@+id/view_top_guile_line">
 
         <TextView
             android:layout_width="wrap_content"
@@ -85,25 +77,27 @@
             android:inputType="number"
             android:maxLength="11"
             android:textColor="@color/text_title_282828"
+            android:textColorHint="@color/color_bdbfd0"
             android:textSize="@dimen/dp_15"
             tools:ignore="SpUsage"
             tools:text="123456" />
+
     </LinearLayout>
 
     <Button
         android:id="@+id/btn_next"
-        android:layout_width="270dp"
+        android:layout_width="275dp"
-        android:layout_height="@dimen/dp_45"
+        android:layout_height="50dp"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="20dp"
         android:background="@drawable/bg_common_confirm"
         android:enabled="false"
         android:gravity="center"
-        android:text="下一步"
+        android:text="获取验证码"
-        android:textColor="@color/white"
+        android:textColor="@color/color_selector_282828_false_878b9c"
+        android:textSize="15sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/ll_account" />
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -564,7 +564,7 @@
     <!-- 页面三级背景色,一般用于输入框-->
     <color name="bg_thirdly_f1f1fa">#FFF1F1FA</color>
     <!-- 按钮不可点击背景颜色 -->
-    <color name="bg_disable_303043">#CEEFFD</color>
+    <color name="bg_disable_f2f3f6">#F2F3F6</color>
     <!-- 输入框背景颜色 -->
     <color name="bg_edit_e8e8f6">#E8E8F6</color>
     <!-- 标题文字颜色 -->

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

@@ -881,7 +881,7 @@
     <string name="my_room">我的房间</string>
     <string name="collect_room">收藏房间</string>
     <string name="ranking">榜单</string>
-    <string name="str_send_code_success">验证码已发送至</string>
+    <string name="str_send_code_success">验证码已发送至\n+86</string>
     <string name="str_nick_title">昵称：</string>
     <string name="recommend_topic">推荐话题</string>
     <string name="join_topic">参与话题</string>

app/src/module_community/res/drawable/selector_dy_send_btn.xml

@@ -3,7 +3,7 @@
     <item android:state_enabled="false">
         <shape android:shape="rectangle">
             <corners android:radius="@dimen/dp_50" />
-            <solid android:color="@color/bg_disable_303043" />
+            <solid android:color="@color/bg_disable_f2f3f6" />
         </shape>
     </item>
     <item android:state_enabled="true">

app/src/module_quick_pass/res/layout/act_quick_pass.xml

@@ -8,58 +8,38 @@
 
     <ImageView
         android:id="@+id/iv_logo"
-        android:layout_width="80dp"
+        android:layout_width="0dp"
-        android:layout_height="80dp"
+        android:layout_height="0dp"
-        android:layout_marginTop="105dp"
+        android:src="@drawable/bg_login_top"
-        android:src="@drawable/about_logo"
+        app:layout_constraintDimensionRatio="750:726"
-        app:layout_constraintEnd_toStartOf="@id/tv_slogan"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
+    <View
-        android:id="@+id/tv_app_name"
+        android:id="@+id/view_top_guile_line"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="1px"
-        android:layout_marginStart="8dp"
+        android:layout_marginBottom="34dp"
-        android:text="@string/app_name"
-        android:textColor="@color/text_title_282828"
-        android:textSize="@dimen/dp_21"
-        app:layout_constraintBottom_toTopOf="@id/tv_slogan"
-        app:layout_constraintStart_toEndOf="@id/iv_logo"
-        app:layout_constraintTop_toTopOf="@id/iv_logo"
-        app:layout_constraintVertical_chainStyle="packed" />
-
-    <TextView
-        android:id="@+id/tv_slogan"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="10dp"
-        android:text="来音萌，用声音交真挚的朋友"
-        android:textColor="@color/text_title_282828"
-        android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="@id/iv_logo"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
-        app:layout_constraintStart_toEndOf="@id/iv_logo"
-        app:layout_constraintTop_toBottomOf="@id/tv_app_name" />
 
     <TextView
         android:id="@+id/tv_login_quick_pass"
-        android:layout_width="270dp"
+        android:layout_width="275dp"
-        android:layout_height="45dp"
+        android:layout_height="50dp"
-        android:layout_marginTop="40dp"
-        android:layout_marginBottom="130dp"
         android:background="@drawable/bg_common_confirm"
         android:gravity="center"
         android:text="本机号码一键登录"
-        android:textColor="@color/white"
+        android:textColor="@color/text_normal_282828"
         android:textSize="@dimen/dp_15"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/iv_logo"
+        app:layout_constraintTop_toBottomOf="@id/view_top_guile_line"
-        tools:ignore="SpUsage" />
+        tools:ignore="SpUsage"
+        tools:visibility="visible" />
 
     <CheckBox
         android:id="@+id/tv_protocol"
@@ -71,7 +51,7 @@
         android:drawableStart="@drawable/selector_login_radio_btn"
         android:drawablePadding="@dimen/dp_5"
         android:text="@string/text_login_protocol"
-        android:textColor="#FFBBB1FF"
+        android:textColor="@color/text_secondary_878b9c"
         android:textSize="@dimen/dp_11"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -99,7 +79,7 @@
         android:id="@+id/container_third_part"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dp_35"
+        android:layout_marginBottom="@dimen/dp_50"
         android:orientation="horizontal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -112,10 +92,10 @@
             android:drawableTop="@drawable/ic_login_qq"
             android:drawablePadding="@dimen/dp_15"
             android:gravity="center"
-            android:text="QQ"
             android:textColor="@color/text_title_282828"
             android:textSize="@dimen/dp_11"
             android:visibility="gone"
+            tools:text="QQ"
             tools:visibility="visible" />
 
         <TextView
@@ -127,9 +107,9 @@
             android:drawableTop="@drawable/ic_login_phone"
             android:drawablePadding="@dimen/dp_15"
             android:gravity="center"
-            android:text="手机"
             android:textColor="@color/text_title_282828"
-            android:textSize="@dimen/dp_11" />
+            android:textSize="@dimen/dp_11"
+            tools:text="手机" />
 
         <TextView
             android:id="@+id/img_wx_login"
@@ -138,10 +118,10 @@
             android:drawableTop="@drawable/ic_login_wx"
             android:drawablePadding="@dimen/dp_15"
             android:gravity="center"
-            android:text="微信"
             android:textColor="@color/text_title_282828"
             android:textSize="@dimen/dp_11"
             android:visibility="gone"
+            tools:text="微信"
             tools:visibility="visible" />
 
     </LinearLayout>