Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

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

        <RelativeLayout
@@ -53,7 +53,7 @@
                android:layout_marginEnd="@dimen/dp_150"
                android:gravity="center_vertical"
                android:text="@string/home_chinese_mainland"
                android:textColor="@color/text_E6FFFFFF"
                android:textColor="@color/text_FFACACAC"
                android:textSize="@dimen/text_14" />

            <TextView
@@ -62,10 +62,10 @@
                android:layout_height="match_parent"
                android:layout_alignParentEnd="true"
                android:layout_centerVertical="true"
                android:layout_marginEnd="@dimen/dp_43"
                android:layout_marginEnd="@dimen/dp_35"
                android:gravity="center_vertical|end"
                android:text="+86"
                android:textColor="@color/text_66FFFFFF"
                android:textColor="@color/text_FF5B5B5B"
                android:textSize="@dimen/text_14"

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

        <RelativeLayout
@@ -124,8 +124,8 @@
                android:inputType="phone"
                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
@@ -167,7 +167,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" />

        <!--手机获取验证码-->
@@ -191,7 +191,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
@@ -214,8 +214,8 @@
                android:inputType="phone"
                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"

                />
@@ -248,7 +248,7 @@
        android:enabled="false"
        android:gravity="center"
        android:text="@string/home_login_affirm"
        android:textColor="@color/text_66FFFFFF"
        android:textColor="@color/text_FF5B5B5B"
        android:textSize="14sp"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"