完善资料页面UI修改

app/src/main/java/com/yizhuan/erban/ui/login/AddUserInfoActivity.java

@@ -5,6 +5,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
 import android.view.KeyEvent;
 
+import com.netease.nim.uikit.StatusBarUtil;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.base.BaseActivity;
 import com.yizhuan.erban.ui.login.fragment.AddUserInfoFragment;
@@ -47,4 +48,14 @@ public class AddUserInfoActivity extends BaseActivity {
         }
         return super.onKeyDown(keyCode, event);
     }
+
+    @Override
+    protected boolean needSteepStateBar() {
+        return true;
+    }
+
+    @Override
+    protected void setStatusBar() {
+        StatusBarUtil.transparencyBar(this);
+    }
 }

app/src/main/java/com/yizhuan/erban/ui/login/CodeDownDescTimer.java

@@ -1,16 +1,9 @@
 package com.yizhuan.erban.ui.login;
 
-import android.graphics.Color;
 import android.os.CountDownTimer;
-import android.text.Html;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.style.ForegroundColorSpan;
 import android.view.View;
 import android.widget.TextView;
 
-import com.yizhuan.erban.R;
-
 
 /**
  * Created by zhouxiangfeng on 2017/5/2.
@@ -38,17 +31,16 @@ public class CodeDownDescTimer extends CountDownTimer {
     @Override
     public void onTick(long millisUntilFinished) {
         mTvSecond.setVisibility(View.VISIBLE);
-        mTvSecond.setText(millisUntilFinished / 1000 + "");  //设置倒计时时间
+        mTvSecond.setText(millisUntilFinished / 1000 + "s");  //设置倒计时时间
         tvGetCode.setClickable(false); //设置不可点击
-        tvGetCode.setText(Html.fromHtml("<font color=#F770FF font-size=10dp>s </font>" + "后可重新获取验证码"));
+        tvGetCode.setText("后可重新获取验证码");
     }
 
     @Override
     public void onFinish() {
         mTvSecond.setVisibility(View.GONE);
-        tvGetCode.setText(Html.fromHtml("<font color=#F770FF font-size=11dp>重新获取验证码</font>"));
+        tvGetCode.setText("重新获取验证码");
         tvGetCode.setClickable(true);//重新获得点击
-
     }
 
 }

app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.java

@@ -52,7 +52,7 @@ public class LoginCodeActivity extends BaseLoginAct {
 
     private static final String TAG = "LoginVertificationActivity";
 
-    private com.yizhuan.erban.ui.login.ui.CodeEditText codeEt;
+    private CodeEditText codeEt;
     private TextView tvGetCode, tvDesc, tvSecond;
     private String mPhone;
     private boolean isSuperAdmin = false;

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
+    android:background="@color/bg_normal_1c1b22"
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
@@ -14,7 +14,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp_100"
         android:text="@string/add_info"
-        android:textColor="@color/color_333333"
+        android:textColor="@color/text_title_white"
         android:textSize="@dimen/dp_18"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
@@ -27,7 +27,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp_10"
         android:text="@string/gender_cannot_modify"
-        android:textColor="@color/color_999999"
+        android:textColor="@color/text_normal_c6c6e9"
         android:textSize="@dimen/dp_13"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -38,7 +38,7 @@
         android:layout_width="270dp"
         android:layout_height="45dp"
         android:layout_marginTop="50dp"
-        android:background="@drawable/shape_eeeeee_corner"
+        android:background="@drawable/bg_common_disable"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_detail" />
@@ -50,7 +50,7 @@
         android:layout_marginStart="23dp"
         android:gravity="center_vertical"
         android:text="昵称"
-        android:textColor="@color/color_999999"
+        android:textColor="@color/text_normal_c6c6e9"
         android:textSize="@dimen/dp_15"
         app:layout_constraintBottom_toBottomOf="@id/view_nick_bg"
         app:layout_constraintStart_toStartOf="@id/view_nick_bg"
@@ -69,7 +69,7 @@
         android:paddingStart="@dimen/dp_9"
         android:singleLine="true"
         android:text="@string/text_default_nick"
-        android:textColor="@color/color_333333"
+        android:textColor="@color/text_title_white"
         android:textSize="@dimen/dp_14"
         app:layout_constraintBottom_toBottomOf="@id/view_nick_bg"
         app:layout_constraintEnd_toStartOf="@id/tv_random_nick"
@@ -82,7 +82,7 @@
         android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:paddingEnd="23dp"
-        android:src="@mipmap/ic_random_nick"
+        android:src="@drawable/ic_random_nick"
         app:layout_constraintBottom_toBottomOf="@id/view_nick_bg"
         app:layout_constraintEnd_toEndOf="@id/view_nick_bg"
         app:layout_constraintTop_toTopOf="@id/view_nick_bg" />
@@ -120,7 +120,7 @@
         android:layout_width="270dp"
         android:layout_height="45dp"
         android:layout_marginTop="20dp"
-        android:background="@drawable/shape_eeeeee_corner"
+        android:background="@drawable/bg_common_disable"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/rg_gender" />
@@ -131,7 +131,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="23dp"
         android:text="邀请码:"
-        android:textColor="@color/color_999999"
+        android:textColor="@color/text_normal_c6c6e9"
         android:textSize="@dimen/dp_15"
         app:layout_constraintBottom_toBottomOf="@id/view_code_bg"
         app:layout_constraintStart_toStartOf="@id/view_code_bg"
@@ -150,28 +150,16 @@
         android:maxLength="8"
         android:paddingEnd="23dp"
         android:singleLine="true"
-        android:textColor="@color/color_333333"
-        android:textColorHint="@color/color_999999"
+        android:textColor="@color/text_title_white"
+        android:textColorHint="@color/text_hint_555574"
         android:textSize="@dimen/dp_14"
         app:layout_constraintBottom_toBottomOf="@id/view_code_bg"
-
         app:layout_constraintEnd_toEndOf="@id/view_code_bg"
         app:layout_constraintStart_toEndOf="@id/tv_code_title"
         app:layout_constraintTop_toTopOf="@id/view_code_bg"
         tools:ignore="SpUsage" />
 
 
-    <View
-        android:id="@+id/view1"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginStart="75dp"
-        android:layout_marginTop="@dimen/dp_14"
-        android:layout_marginEnd="75dp"
-        android:background="#30F4F4F4"
-        app:layout_constraintTop_toBottomOf="@id/tv_code_title" />
-
-
     <Button
         android:id="@+id/ok_btn"
         android:layout_width="match_parent"
@@ -180,7 +168,7 @@
         android:layout_marginTop="30dp"
         android:layout_marginEnd="@dimen/login_btn_padding"
         android:layout_marginBottom="@dimen/dp_16"
-        android:background="@drawable/common_btn_bg"
+        android:background="@drawable/bg_common_confirm"
         android:text="@string/done"
         android:textColor="@color/white"
         android:textSize="@dimen/sp_15"
@@ -194,7 +182,7 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="15dp"
         android:text="@string/add_user_info_desc"
-        android:textColor="#BBB1FF"
+        android:textColor="@color/text_secondary_4f516a"
         android:textSize="@dimen/dp_11"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

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

@@ -11,6 +11,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="@dimen/dp_17"
+        android:layout_marginTop="@dimen/dp_25"
         android:src="@drawable/arrow_left_white"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -47,7 +48,7 @@
         android:layout_marginTop="30dp"
         android:focusable="true"
         android:inputType="number"
-        android:textColor="@color/color_333333"
+        android:textColor="@color/text_title_white"
         android:textSize="@dimen/sp_18"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -73,7 +74,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:includeFontPadding="false"
-            android:text="60S"
+            android:text="60s"
+            android:typeface="monospace"
             android:textColor="@color/app_248cfe"
             android:textSize="@dimen/sp_15"
             android:visibility="gone"

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

@@ -10,6 +10,7 @@
         android:id="@+id/iv_back"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_25"
         android:padding="@dimen/dp_17"
         android:src="@drawable/arrow_left_white"
         app:layout_constraintStart_toStartOf="parent"