Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -3,20 +3,20 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:id="@+id/item_parent_cl"
    android:layout_width="match_parent"
    android:layout_height="@dimen/dp_70"
    android:background="@color/text_FFFFFFFF">
    android:layout_height="@dimen/dp_52"
    android:background="@color/text_FF1C1C1E">

    <TextView
        android:id="@+id/house_name_tv"
        android:layout_width="0dp"
        android:layout_height="@dimen/dp_19"
        android:layout_height="@dimen/dp_23"
        android:layout_marginStart="@dimen/dp_16"
        android:layout_marginEnd="@dimen/dp_16"
        android:ellipsize="end"
        android:singleLine="true"
        android:text="@string/power_station"
        android:textColor="@color/text_E6000000"
        android:textSize="@dimen/text_16"
        android:textColor="@color/text_FFACACAC"
        android:textSize="@dimen/text_14"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toStartOf="@+id/house_Image_ll"
        app:layout_constraintStart_toStartOf="parent"
@@ -42,26 +42,25 @@

        <ImageView
            android:id="@+id/house_move_iv"
            android:layout_width="@dimen/dp_40"
            android:layout_height="@dimen/dp_40"
            android:layout_width="@dimen/dp_26"
            android:layout_height="@dimen/dp_26"
            android:layout_marginEnd="@dimen/dp_21"
            android:src="@drawable/move_c_house"
            android:visibility="gone" />

        <ImageView
            android:id="@+id/house_select_iv"
            android:layout_width="@dimen/dp_40"
            android:layout_height="@dimen/dp_40"
            android:layout_marginEnd="@dimen/dp_21"
            android:layout_width="@dimen/dp_39"
            android:layout_height="@dimen/dp_39"
            android:layout_marginEnd="@dimen/dp_16"
            android:visibility="gone" />
    </LinearLayout>

    <View
        android:layout_width="match_parent"
        android:layout_width="0dp"
        android:layout_height="0.5dp"
        android:layout_marginStart="@dimen/dp_16"
        android:layout_marginEnd="@dimen/dp_16"
        android:layout_marginBottom="0.5dp"
        android:background="@color/text_1AFFFFFF"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"