wjc
2025-02-14 20119c1e9849ab28add56b977ffbca87e13e1072
app/src/main/res/layout/activity_change_password.xml
@@ -4,14 +4,15 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@drawable/login"
    tools:context=".ui.account.ChangePassword">
    <TextView
        android:id="@+id/change_back_tv"
        android:layout_width="@dimen/dp_24"
        android:layout_height="@dimen/dp_24"
        android:layout_width="@dimen/dp_30"
        android:layout_height="@dimen/dp_30"
        android:layout_marginStart="@dimen/dp_16"
        android:layout_marginTop="@dimen/dp_12"
        android:layout_marginTop="@dimen/dp_38"
        android:background="@drawable/back"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />
@@ -21,12 +22,11 @@
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_39"
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginTop="@dimen/dp_42"
        android:text="@string/home_login_修改密码"
        android:layout_marginTop="@dimen/dp_39"
        android:text="@string/home_login_change_password"
        android:textAlignment="center"
        android:textColor="@color/text_90000000"
        android:textColor="@color/text_E6FFFFFF"
        android:textSize="@dimen/text_28"
        android:textStyle="bold"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/change_back_tv" />
    <!--手机号-->
@@ -34,8 +34,8 @@
        android:id="@+id/change_phone_ic"
        layout="@layout/text_underline"
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_31"
        android:layout_marginTop="@dimen/dp_52"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/dp_43"
        app:layout_constraintStart_toStartOf="@+id/change_title_tv"
        app:layout_constraintTop_toBottomOf="@+id/change_title_tv" />
    <!--邮箱-->
@@ -43,20 +43,79 @@
        android:id="@+id/change_mail_rl"
        layout="@layout/text_underline"
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_31"
        android:layout_height="wrap_content"
        android:layout_marginStart="@dimen/dp_28"
        android:layout_marginTop="@dimen/dp_52"
        android:layout_marginTop="@dimen/dp_43"
        app:layout_constraintStart_toEndOf="@+id/change_phone_ic"
        app:layout_constraintTop_toBottomOf="@+id/change_title_tv" />
    <View
        android:id="@+id/interval"
        android:layout_width="match_parent"
        android:layout_height="2.5dp"
        android:layout_marginTop="100dp"
        app:layout_constraintStart_toStartOf="@+id/change_title_tv"
        app:layout_constraintTop_toBottomOf="@+id/change_title_tv" />
    <RelativeLayout
        android:id="@+id/region_account_rl"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_60"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/interval">
        <TextView
            android:id="@+id/region_account_tv"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_150"
            android:gravity="center_vertical"
            android:text="@string/home_chinese_mainland"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14" />
        <TextView
            android:id="@+id/region_account_number_tv"
            android:layout_width="@dimen/dp_90"
            android:layout_height="match_parent"
            android:layout_alignParentEnd="true"
            android:layout_centerVertical="true"
            android:layout_marginEnd="@dimen/dp_58"
            android:gravity="center_vertical|end"
            android:text="+86"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14"
            />
        <ImageView
            android:id="@+id/region_account_next_iv"
            android:layout_width="@dimen/dp_20"
            android:layout_height="@dimen/dp_20"
            android:layout_alignParentEnd="true"
            android:layout_centerVertical="true"
            android:layout_marginEnd="@dimen/dp_26"
            android:src="@drawable/spinner" />
        <View
            android:layout_width="match_parent"
            android:layout_height="0.5dp"
            android:layout_alignParentBottom="true"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_20"
            android:background="@color/text_1AFFFFFF" />
    </RelativeLayout>
    <RelativeLayout
        android:id="@+id/change_account_rl"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_60"
        android:layout_marginTop="102.5dp"
        app:layout_constraintStart_toStartOf="@+id/change_title_tv"
        app:layout_constraintTop_toBottomOf="@+id/change_title_tv">
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/region_account_rl">
        <EditText
            android:id="@+id/change_account_et"
@@ -65,13 +124,13 @@
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_60"
            android:background="@null"
            android:hint="@string/home_login_请输入手机号"
            android:hint="@string/home_login_input_phone"
            android:inputType="text"
            android:lines="1"
            android:maxLines="1"
            android:textColor="@color/text_FF000000"
            android:textColorHint="@color/text_25000000"
            android:textSize="@dimen/text_16" />
            android:textColor="@color/text_E6FFFFFF"
            android:textColorHint="@color/text_66FFFFFF"
            android:textSize="@dimen/text_14" />
        <View
            android:layout_width="match_parent"
@@ -79,7 +138,7 @@
            android:layout_alignParentBottom="true"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_20"
            android:background="@color/text_E1E1E1" />
            android:background="@color/text_1AFFFFFF" />
    </RelativeLayout>
    <!--手机获取验证码-->
@@ -100,8 +159,8 @@
            android:layout_marginEnd="@dimen/dp_20"
            android:gravity="center"
            android:padding="@dimen/dp_16"
            android:text="@string/home_login_验证码"
            android:textColor="@color/text_245EC3"
            android:text="@string/home_login_verification_code"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14" />
        <View
@@ -110,7 +169,7 @@
            android:layout_height="20dp"
            android:layout_alignStart="@+id/change_phone_verification_tv"
            android:layout_centerInParent="true"
            android:background="@color/text_E1E1E1" />
            android:background="@color/text_1AFFFFFF" />
        <EditText
            android:id="@+id/change_phone_verification_et"
@@ -120,13 +179,13 @@
            android:layout_alignParentStart="true"
            android:layout_marginStart="@dimen/dp_20"
            android:background="@null"
            android:hint="@string/home_login_input_验证码"
            android:hint="@string/home_login_input_verification_code"
            android:inputType="text"
            android:lines="1"
            android:maxLines="1"
            android:textColor="@color/text_FF000000"
            android:textColorHint="@color/text_25000000"
            android:textSize="@dimen/text_16"
            android:textColor="@color/text_E6FFFFFF"
            android:textColorHint="@color/text_66FFFFFF"
            android:textSize="@dimen/text_14"
            />
@@ -136,7 +195,7 @@
            android:layout_alignParentBottom="true"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_20"
            android:background="@color/text_E1E1E1" />
            android:background="@color/text_1AFFFFFF" />
    </RelativeLayout>
@@ -158,8 +217,8 @@
            android:layout_marginEnd="@dimen/dp_20"
            android:gravity="center"
            android:padding="@dimen/dp_16"
            android:text="@string/home_login_send_mail"
            android:textColor="@color/text_245EC3"
            android:text="@string/home_login_verification_code"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14" />
        <View
@@ -168,7 +227,7 @@
            android:layout_height="20dp"
            android:layout_alignStart="@+id/change_mail_verification_tv"
            android:layout_centerInParent="true"
            android:background="@color/text_E1E1E1" />
            android:background="@color/text_1AFFFFFF" />
        <EditText
            android:id="@+id/change_mail_verification_et"
@@ -178,13 +237,13 @@
            android:layout_alignParentStart="true"
            android:layout_marginStart="@dimen/dp_20"
            android:background="@null"
            android:hint="@string/home_login_input_验证码"
            android:hint="@string/home_login_input_verification_code"
            android:inputType="text"
            android:lines="1"
            android:maxLines="1"
            android:textColor="@color/text_FF000000"
            android:textColorHint="@color/text_25000000"
            android:textSize="@dimen/text_16"
            android:textColor="@color/text_E6FFFFFF"
            android:textColorHint="@color/text_66FFFFFF"
            android:textSize="@dimen/text_14"
            />
@@ -194,7 +253,7 @@
            android:layout_alignParentBottom="true"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_20"
            android:background="@color/text_E1E1E1" />
            android:background="@color/text_1AFFFFFF" />
    </RelativeLayout>
@@ -219,9 +278,9 @@
            android:inputType="textPassword"
            android:lines="1"
            android:maxLines="1"
            android:textColor="@color/text_FF000000"
            android:textColorHint="@color/text_25000000"
            android:textSize="@dimen/text_16" />
            android:textColor="@color/text_E6FFFFFF"
            android:textColorHint="@color/text_66FFFFFF"
            android:textSize="@dimen/text_14" />
        <ImageView
            android:id="@+id/change_psw_hide_iv"
@@ -238,7 +297,7 @@
            android:layout_alignParentBottom="true"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_20"
            android:background="@color/text_E1E1E1" />
            android:background="@color/text_1AFFFFFF" />
    </RelativeLayout>
@@ -261,9 +320,9 @@
            android:inputType="textPassword"
            android:lines="1"
            android:maxLines="1"
            android:textColor="@color/text_FF000000"
            android:textColorHint="@color/text_25000000"
            android:textSize="@dimen/text_16" />
            android:textColor="@color/text_E6FFFFFF"
            android:textColorHint="@color/text_66FFFFFF"
            android:textSize="@dimen/text_14" />
        <ImageView
            android:id="@+id/change_confirm_psw_hide_iv"
@@ -280,11 +339,11 @@
            android:layout_alignParentBottom="true"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_20"
            android:background="@color/text_E1E1E1" />
            android:background="@color/text_1AFFFFFF" />
    </RelativeLayout>
    <!--错误提示-->
    <TextView
        android:id="@+id/text_error_tv"
        android:layout_width="wrap_content"
@@ -302,12 +361,12 @@
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginTop="@dimen/dp_42"
        android:layout_marginEnd="@dimen/dp_20"
        android:background="@drawable/yesandnocheck"
        android:background="@drawable/bj_ccffff_13"
        android:enabled="false"
        android:gravity="center"
        android:text="@string/home_login_确认重置"
        android:textColor="@color/text_FFFFFFFF"
        android:textSize="18sp"
        android:text="@string/home_login_confirm_reset"
        android:textColor="@color/text_66FFFFFF"
        android:textSize="14sp"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/change_confirm_psw_rl" />