Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -4,18 +4,26 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_FF161616"
    android:background="@color/text_FF000000"
    tools:context=".ui.me.BindMailActivity">


    <include
        android:id="@+id/toolbar_top_rl"
        layout="@layout/toolbar_top_view_44" />
        layout="@layout/toolbar_top_view_44"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_44"
        android:layout_marginTop="@dimen/dp_38"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />


    <RelativeLayout
        android:id="@+id/bind_mail_parent_rl"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_100"
        android:layout_marginTop="@dimen/dp_20"
        android:layout_height="78dp"
        android:layout_marginTop="@dimen/dp_10"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">
@@ -25,15 +33,14 @@
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_20"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="@dimen/dp_24"
            android:text="@string/home_login_email"
            android:textColor="@color/text_E6FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_14" />

        <RelativeLayout
            android:id="@+id/bind_mail_rl"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_52"
            android:layout_height="@dimen/dp_50"
            android:layout_below="@+id/bind_mail_title_tv"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="@dimen/dp_8"
@@ -54,8 +61,8 @@
                android:inputType="text"
                android:lines="1"
                android:maxLines="1"
                android:textColor="@color/text_E6FFFFFF"
                android:textColorHint="@color/text_66FFFFFF"
                android:textColor="@color/text_FFACACAC"
                android:textColorHint="@color/text_FF5B5B5B"
                android:textSize="@dimen/text_14" />

            <ImageView
@@ -85,8 +92,8 @@
    <RelativeLayout
        android:id="@+id/bind_phone_verification_parent_rl"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_100"
        android:layout_marginTop="@dimen/dp_24"
        android:layout_height="78dp"
        android:layout_marginTop="@dimen/dp_25"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/bind_mail_parent_rl">
@@ -97,14 +104,14 @@
            android:layout_height="@dimen/dp_20"
            android:layout_marginStart="@dimen/dp_20"
            android:text="@string/verification"
            android:textColor="@color/text_E6FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_14" />

        <!--邮箱获取验证码-->
        <RelativeLayout
            android:id="@+id/bind_mail_verification_code_rl"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_52"
            android:layout_height="@dimen/dp_50"
            android:layout_below="@+id/bind_mail_verification_title_tv"
            android:layout_marginStart="@dimen/dp_20"
            android:layout_marginTop="@dimen/dp_8"
@@ -121,7 +128,7 @@
                android:paddingStart="@dimen/dp_16"
                android:paddingEnd="@dimen/dp_0"
                android:text="@string/home_login_verification_code"
                android:textColor="@color/text_E6FFFFFF"
                android:textColor="@color/text_FFACACAC"
                android:textSize="@dimen/text_14" />

            <View
@@ -144,9 +151,9 @@
                android:inputType="text"
                android:lines="1"
                android:maxLines="1"
                android:textColor="@color/text_E6FFFFFF"
                android:textColorHint="@color/text_66FFFFFF"
                android:textSize="@dimen/text_16"
                android:textColor="@color/text_FFACACAC"
                android:textColorHint="@color/text_FF5B5B5B"
                android:textSize="@dimen/text_14"

                />

@@ -172,13 +179,14 @@
        android:layout_width="match_parent"
        android:layout_height="52dp"
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginTop="73dp"
        android:layout_marginTop="50dp"
        android:layout_marginEnd="@dimen/dp_20"
        android:background="@drawable/bj_ff555859"
        android:background="@drawable/bj_ff39383d"
        android:gravity="center"
        android:text="@string/home_login_affirm"
        android:textColor="@color/text_E6FFFFFF"
        android:textSize="18sp"
        android:enabled="false"
        android:textColor="@color/text_FF5B5B5B"
        android:textSize="14sp"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/bind_phone_verification_parent_rl" />