Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -46,7 +46,7 @@
        android:layout_marginTop="@dimen/dp_8"
        android:layout_marginEnd="@dimen/dp_20"
        android:text="@string/home_login_least6"
        android:textColor="@color/text_66FFFFFF"
        android:textColor="@color/text_FF5B5B5B"
        android:textSize="@dimen/text_14"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/me_psw_ll" />
@@ -71,7 +71,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"