Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -7,368 +7,382 @@
    android:background="@drawable/login"
    tools:context=".ui.account.ChangePassword">

    <TextView
        android:id="@+id/change_back_tv"
        android:layout_width="@dimen/dp_30"
        android:layout_height="@dimen/dp_30"
        android:layout_marginStart="@dimen/dp_16"
        android:layout_marginTop="@dimen/dp_38"
        android:background="@drawable/back"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

    <TextView
        android:id="@+id/change_title_tv"
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_39"
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginTop="@dimen/dp_39"
        android:text="@string/home_login_change_password"
        android:textAlignment="center"
        android:textColor="@color/text_E6FFFFFF"
        android:textSize="@dimen/text_28"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/change_back_tv" />
    <!--手机号-->
    <include
        android:id="@+id/change_phone_ic"
        layout="@layout/text_underline"
        android:layout_width="wrap_content"
        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" />
    <!--邮箱-->
    <include
        android:id="@+id/change_mail_rl"
        layout="@layout/text_underline"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginStart="@dimen/dp_28"
        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"
    <androidx.core.widget.NestedScrollView
        android:id="@+id/parent_nsv"
        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" />
        android:layout_height="match_parent"
        android:fillViewport="true"
        android:overScrollMode="never">

    <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"
        <androidx.constraintlayout.widget.ConstraintLayout
            android:id="@+id/parent_cl1"
            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" />
            android:layout_height="match_parent">

        <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"
            <TextView
                android:id="@+id/change_back_tv"
                android:layout_width="@dimen/dp_30"
                android:layout_height="@dimen/dp_30"
                android:layout_marginStart="@dimen/dp_16"
                android:layout_marginTop="@dimen/dp_38"
                android:background="@drawable/back"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toTopOf="parent" />

            />
            <TextView
                android:id="@+id/change_title_tv"
                android:layout_width="wrap_content"
                android:layout_height="@dimen/dp_39"
                android:layout_marginStart="@dimen/dp_20"
                android:layout_marginTop="@dimen/dp_39"
                android:text="@string/home_login_change_password"
                android:textAlignment="center"
                android:textColor="@color/text_FFACACAC"
                android:textSize="@dimen/text_28"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@+id/change_back_tv" />
            <!--手机号-->
            <include
                android:id="@+id/change_phone_ic"
                layout="@layout/text_underline"
                android:layout_width="wrap_content"
                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" />
            <!--邮箱-->
            <include
                android:id="@+id/change_mail_rl"
                layout="@layout/text_underline"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginStart="@dimen/dp_28"
                android:layout_marginTop="@dimen/dp_43"
                app:layout_constraintStart_toEndOf="@+id/change_phone_ic"
                app:layout_constraintTop_toBottomOf="@+id/change_title_tv" />

        <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: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" />

        <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
                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">

    </RelativeLayout>
                <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_FFACACAC"
                    android:textSize="@dimen/text_14" />

    <RelativeLayout
        android:id="@+id/change_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/region_account_rl">
                <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_50"
                    android:gravity="center_vertical|end"
                    android:text="+86"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14"

        <EditText
            android:id="@+id/change_account_et"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_60"
            android:background="@null"
            android:hint="@string/home_login_input_phone"
            android:inputType="text"
            android:lines="1"
            android:maxLines="1"
            android:textColor="@color/text_E6FFFFFF"
            android:textColorHint="@color/text_66FFFFFF"
            android:textSize="@dimen/text_14" />
                    />

        <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" />
                <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" />

    </RelativeLayout>
    <!--手机获取验证码-->
    <RelativeLayout
        android:id="@+id/change_phone_verification_code_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/change_account_rl">
                <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"
                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"
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
                    android:layout_marginStart="@dimen/dp_20"
                    android:layout_marginEnd="@dimen/dp_60"
                    android:background="@null"
                    android:hint="@string/home_login_input_phone"
                    android:inputType="text"
                    android:lines="1"
                    android:maxLines="1"
                    android:textColor="@color/text_FFACACAC"
                    android:textColorHint="@color/text_FF5B5B5B"
                    android:textSize="@dimen/text_14" />

                <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_phone_verification_code_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/change_account_rl">


        <TextView
            android:id="@+id/change_phone_verification_tv"
            android:layout_width="wrap_content"
            android:layout_height="match_parent"
            android:layout_alignParentEnd="true"
            android:layout_marginEnd="@dimen/dp_20"
            android:gravity="center"
            android:padding="@dimen/dp_16"
            android:text="@string/home_login_verification_code"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14" />
                <TextView
                    android:id="@+id/change_phone_verification_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                    android:layout_alignParentEnd="true"
                    android:layout_marginEnd="@dimen/dp_20"
                    android:gravity="center"
                    android:padding="@dimen/dp_16"
                    android:text="@string/home_login_verification_code"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14" />

        <View
            android:id="@+id/change_phone_verification_v"
            android:layout_width="0.5dp"
            android:layout_height="20dp"
            android:layout_alignStart="@+id/change_phone_verification_tv"
            android:layout_centerInParent="true"
            android:background="@color/text_1AFFFFFF" />
                <View
                    android:id="@+id/change_phone_verification_v"
                    android:layout_width="0.5dp"
                    android:layout_height="20dp"
                    android:layout_alignStart="@+id/change_phone_verification_tv"
                    android:layout_centerInParent="true"
                    android:background="@color/text_1AFFFFFF" />

        <EditText
            android:id="@+id/change_phone_verification_et"
            android:layout_width="@dimen/dp_150"
            android:layout_height="match_parent"
            android:layout_alignStart="@+id/change_phone_verification_v"
            android:layout_alignParentStart="true"
            android:layout_marginStart="@dimen/dp_20"
            android:background="@null"
            android:hint="@string/home_login_input_verification_code"
            android:inputType="text"
            android:lines="1"
            android:maxLines="1"
            android:textColor="@color/text_E6FFFFFF"
            android:textColorHint="@color/text_66FFFFFF"
            android:textSize="@dimen/text_14"
                <EditText
                    android:id="@+id/change_phone_verification_et"
                    android:layout_width="@dimen/dp_150"
                    android:layout_height="match_parent"
                    android:layout_alignStart="@+id/change_phone_verification_v"
                    android:layout_alignParentStart="true"
                    android:layout_marginStart="@dimen/dp_20"
                    android:background="@null"
                    android:hint="@string/home_login_input_verification_code"
                    android:inputType="text"
                    android:lines="1"
                    android:maxLines="1"
                    android:textColor="@color/text_FFACACAC"
                    android:textColorHint="@color/text_FF5B5B5B"
                    android:textSize="@dimen/text_14"

            />
                    />

        <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" />
                <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_mail_verification_code_rl"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_60"
        android:visibility="gone"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/change_account_rl">
            </RelativeLayout>
            <!--邮箱获取验证码-->
            <RelativeLayout
                android:id="@+id/change_mail_verification_code_rl"
                android:layout_width="match_parent"
                android:layout_height="@dimen/dp_60"
                android:visibility="gone"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@+id/change_account_rl">

        <TextView
            android:id="@+id/change_mail_verification_tv"
            android:layout_width="wrap_content"
            android:layout_height="match_parent"
            android:layout_alignParentEnd="true"
            android:layout_marginEnd="@dimen/dp_20"
            android:gravity="center"
            android:padding="@dimen/dp_16"
            android:text="@string/home_login_verification_code"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14" />
                <TextView
                    android:id="@+id/change_mail_verification_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                    android:layout_alignParentEnd="true"
                    android:layout_marginEnd="@dimen/dp_20"
                    android:gravity="center"
                    android:padding="@dimen/dp_16"
                    android:text="@string/home_login_verification_code"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14" />

        <View
            android:id="@+id/change_mail_verification_v"
            android:layout_width="0.5dp"
            android:layout_height="20dp"
            android:layout_alignStart="@+id/change_mail_verification_tv"
            android:layout_centerInParent="true"
            android:background="@color/text_1AFFFFFF" />
                <View
                    android:id="@+id/change_mail_verification_v"
                    android:layout_width="0.5dp"
                    android:layout_height="20dp"
                    android:layout_alignStart="@+id/change_mail_verification_tv"
                    android:layout_centerInParent="true"
                    android:background="@color/text_1AFFFFFF" />

        <EditText
            android:id="@+id/change_mail_verification_et"
            android:layout_width="@dimen/dp_150"
            android:layout_height="match_parent"
            android:layout_alignStart="@+id/change_mail_verification_v"
            android:layout_alignParentStart="true"
            android:layout_marginStart="@dimen/dp_20"
            android:background="@null"
            android:hint="@string/home_login_input_verification_code"
            android:inputType="text"
            android:lines="1"
            android:maxLines="1"
            android:textColor="@color/text_E6FFFFFF"
            android:textColorHint="@color/text_66FFFFFF"
            android:textSize="@dimen/text_14"
                <EditText
                    android:id="@+id/change_mail_verification_et"
                    android:layout_width="@dimen/dp_150"
                    android:layout_height="match_parent"
                    android:layout_alignStart="@+id/change_mail_verification_v"
                    android:layout_alignParentStart="true"
                    android:layout_marginStart="@dimen/dp_20"
                    android:background="@null"
                    android:hint="@string/home_login_input_verification_code"
                    android:inputType="text"
                    android:lines="1"
                    android:maxLines="1"
                    android:textColor="@color/text_FFACACAC"
                    android:textColorHint="@color/text_FF5B5B5B"
                    android:textSize="@dimen/text_14"

            />
                    />

        <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" />
                <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>

    <RelativeLayout
        android:id="@+id/change_psw_rl"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_60"
        android:layout_marginTop="@dimen/dp_60"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/change_account_rl">
            <RelativeLayout
                android:id="@+id/change_psw_rl"
                android:layout_width="match_parent"
                android:layout_height="@dimen/dp_60"
                android:layout_marginTop="@dimen/dp_60"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@+id/change_account_rl">

        <EditText
            android:id="@+id/change_psw_et"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_60"
            android:background="@null"
            android:hint="@string/home_login_input_6_16"
            android:inputType="textPassword"
            android:lines="1"
            android:maxLines="1"
            android:textColor="@color/text_E6FFFFFF"
            android:textColorHint="@color/text_66FFFFFF"
            android:textSize="@dimen/text_14" />
                <EditText
                    android:id="@+id/change_psw_et"
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
                    android:layout_marginStart="@dimen/dp_20"
                    android:layout_marginEnd="@dimen/dp_60"
                    android:background="@null"
                    android:hint="@string/home_login_input_6_16"
                    android:inputType="textPassword"
                    android:lines="1"
                    android:maxLines="1"
                    android:textColor="@color/text_FFACACAC"
                    android:textColorHint="@color/text_FF5B5B5B"
                    android:textSize="@dimen/text_14" />

        <ImageView
            android:id="@+id/change_psw_hide_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_32"
            android:src="@drawable/hide" />
                <ImageView
                    android:id="@+id/change_psw_hide_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_32"
                    android:src="@drawable/hide" />

        <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" />
                <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>

    <RelativeLayout
        android:id="@+id/change_confirm_psw_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/change_psw_rl">
            <RelativeLayout
                android:id="@+id/change_confirm_psw_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/change_psw_rl">

        <EditText
            android:id="@+id/change_confirm_psw_et"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginEnd="@dimen/dp_60"
            android:background="@null"
            android:hint="@string/home_login_confirm_psw"
            android:inputType="textPassword"
            android:lines="1"
            android:maxLines="1"
            android:textColor="@color/text_E6FFFFFF"
            android:textColorHint="@color/text_66FFFFFF"
            android:textSize="@dimen/text_14" />
                <EditText
                    android:id="@+id/change_confirm_psw_et"
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
                    android:layout_marginStart="@dimen/dp_20"
                    android:layout_marginEnd="@dimen/dp_60"
                    android:background="@null"
                    android:hint="@string/home_login_confirm_psw"
                    android:inputType="textPassword"
                    android:lines="1"
                    android:maxLines="1"
                    android:textColor="@color/text_FFACACAC"
                    android:textColorHint="@color/text_FF5B5B5B"
                    android:textSize="@dimen/text_14" />

        <ImageView
            android:id="@+id/change_confirm_psw_hide_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_32"
            android:src="@drawable/hide" />
                <ImageView
                    android:id="@+id/change_confirm_psw_hide_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_32"
                    android:src="@drawable/hide" />

        <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" />
                <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>

    <!--错误提示-->
    <TextView
        android:id="@+id/text_error_tv"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginStart="@dimen/dp_20"
        android:textColor="@color/text_D34545"
        android:textSize="12sp"
        app:layout_constraintStart_toStartOf="@+id/change_confirm_psw_rl"
        app:layout_constraintTop_toBottomOf="@+id/change_confirm_psw_rl" />
            <!--错误提示-->
            <TextView
                android:id="@+id/text_error_tv"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginStart="@dimen/dp_20"
                android:textColor="@color/text_D34545"
                android:textSize="12sp"
                app:layout_constraintStart_toStartOf="@+id/change_confirm_psw_rl"
                app:layout_constraintTop_toBottomOf="@+id/change_confirm_psw_rl" />

    <TextView
        android:id="@+id/confirm_tv"
        android:layout_width="0dp"
        android:layout_height="52dp"
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginTop="@dimen/dp_42"
        android:layout_marginEnd="@dimen/dp_20"
        android:background="@drawable/bj_ccffff_13"
        android:enabled="false"
        android:gravity="center"
        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" />
            <TextView
                android:id="@+id/confirm_tv"
                android:layout_width="0dp"
                android:layout_height="52dp"
                android:layout_marginStart="@dimen/dp_20"
                android:layout_marginTop="@dimen/dp_42"
                android:layout_marginEnd="@dimen/dp_20"
                android:background="@drawable/bj_ccffff_13"
                android:enabled="false"
                android:gravity="center"
                android:text="@string/home_login_confirm_reset"
                android:textColor="@color/text_FF5B5B5B"
                android:textSize="14sp"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@+id/change_confirm_psw_rl" />
        </androidx.constraintlayout.widget.ConstraintLayout>
    </androidx.core.widget.NestedScrollView>

</androidx.constraintlayout.widget.ConstraintLayout>