Merge branch '1.2.1' into 1.2.0_google

wjc

2025-05-23 971a24a9e58a21bc306897fd3ad63012a399f7db

 app/src/main/res/layout/activity_bind_mail.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/text_FF161616"
    android:background="@color/text_FF000000"
    tools:context=".ui.me.BindMailActivity">


@@ -34,7 +34,7 @@
            android:layout_height="@dimen/dp_20"
            android:layout_marginStart="@dimen/dp_20"
            android:text="@string/home_login_email"
            android:textColor="@color/text_E6FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_14" />

        <RelativeLayout
@@ -61,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
@@ -104,7 +104,7 @@
            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" />

        <!--邮箱获取验证码-->
@@ -128,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
@@ -145,14 +145,14 @@
                android:layout_height="match_parent"
                android:layout_alignStart="@+id/bind_phone_verification_v"
                android:layout_alignParentStart="true"
                android:layout_marginStart="@dimen/dp_20"
                android:layout_marginStart="@dimen/dp_16"
                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:textColor="@color/text_FFACACAC"
                android:textColorHint="@color/text_FF5B5B5B"
                android:textSize="@dimen/text_14"

                />
@@ -181,11 +181,11 @@
        android:layout_marginStart="@dimen/dp_20"
        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:enabled="false"
        android:textColor="@color/text_66FFFFFF"
        android:textColor="@color/text_FF5B5B5B"
        android:textSize="14sp"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"