Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -37,7 +37,7 @@
                android:layout_marginTop="@dimen/dp_39"
                android:text="@string/home_login_change_password"
                android:textAlignment="center"
                android:textColor="@color/text_E6FFFFFF"
                android:textColor="@color/text_FFACACAC"
                android:textSize="@dimen/text_28"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@+id/change_back_tv" />
@@ -85,7 +85,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
@@ -97,7 +97,7 @@
                    android:layout_marginEnd="@dimen/dp_50"
                    android:gravity="center_vertical|end"
                    android:text="+86"
                    android:textColor="@color/text_E6FFFFFF"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14"

                    />
@@ -140,8 +140,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" />

                <View
@@ -172,7 +172,7 @@
                    android:gravity="center"
                    android:padding="@dimen/dp_16"
                    android:text="@string/home_login_verification_code"
                    android:textColor="@color/text_E6FFFFFF"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14" />

                <View
@@ -195,8 +195,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"

                    />
@@ -230,7 +230,7 @@
                    android:gravity="center"
                    android:padding="@dimen/dp_16"
                    android:text="@string/home_login_verification_code"
                    android:textColor="@color/text_E6FFFFFF"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14" />

                <View
@@ -253,8 +253,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"

                    />
@@ -290,8 +290,8 @@
                    android:inputType="textPassword"
                    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
@@ -332,8 +332,8 @@
                    android:inputType="textPassword"
                    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
@@ -377,7 +377,7 @@
                android:enabled="false"
                android:gravity="center"
                android:text="@string/home_login_confirm_reset"
                android:textColor="@color/text_66FFFFFF"
                android:textColor="@color/text_FF5B5B5B"
                android:textSize="14sp"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"