Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -4,11 +4,19 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_F5F7FA"
    android:background="@color/text_FF000000"
    tools:context=".ui.me.SetActivity">

    <include
        android:id="@+id/toolbar_top_fragment_house_list_rl"
        layout="@layout/toolbar_top_view_44" />
        android:id="@+id/toolbar_top_rl"
        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" />

    <ScrollView
        android:id="@+id/set_sll"
        android:layout_width="match_parent"
@@ -18,13 +26,13 @@
        app:layout_constraintBottom_toTopOf="@+id/out_tv"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl">
        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl">

        <LinearLayout
            android:id="@+id/sll_ll"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:background="@color/text_FFFFFFFF"
            android:background="@color/text_FF1C1C1E"
            android:orientation="vertical">

            <include
@@ -49,11 +57,11 @@
        android:layout_marginStart="@dimen/dp_20"
        android:layout_marginEnd="@dimen/dp_20"
        android:layout_marginBottom="@dimen/dp_55"
        android:background="@drawable/backgruond_ff6b6b"
        android:background="@drawable/bj_ff39383d"
        android:gravity="center"
        android:text="@string/set_logout"
        android:textColor="@color/text_FFFFFFFF"
        android:textSize="@dimen/text_18"
        android:textColor="@color/text_FFACACAC"
        android:textSize="@dimen/text_14"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"