Merge branch '1.2.0'

wjc

2025-05-07 b9cc7390e8e8ce64c41c26fb369c98ce669d660c

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

@@ -2,14 +2,15 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="@dimen/dp_115">
    android:layout_height="117.5dp">

    <androidx.constraintlayout.widget.ConstraintLayout
        android:layout_width="match_parent"
        android:layout_height="99dp"
        android:layout_width="0dp"
        android:layout_height="107.5dp"
        android:layout_marginStart="@dimen/dp_16"
        android:layout_marginTop="@dimen/dp_10"
        android:layout_marginEnd="@dimen/dp_16"
        android:background="@drawable/house_list_line_parent_bg"
        android:background="@drawable/bj_ff1c1c1e"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">
@@ -17,62 +18,69 @@
        <!--未读标签-->
        <TextView
            android:id="@+id/item_unread_message_tv"
            android:layout_width="8dp"
            android:layout_height="8dp"
            android:layout_width="9dp"
            android:layout_height="9dp"
            android:layout_marginTop="@dimen/dp_3"
            android:layout_marginEnd="@dimen/dp_2"
            android:background="@drawable/red_font"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintTop_toTopOf="parent" />

        <TextView
            android:id="@+id/item_content_tv"
            android:layout_width="0dp"
            android:layout_height="@dimen/dp_23"
            android:layout_marginStart="22dp"
            android:layout_marginTop="16dp"
            android:layout_marginEnd="@dimen/dp_5"
            android:ellipsize="end"

        <LinearLayout
            android:id="@+id/ll"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_20"
            android:layout_marginStart="@dimen/dp_16"
            android:layout_marginTop="@dimen/dp_16"
            android:gravity="center_vertical"
            android:singleLine="true"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_16"
            app:layout_constraintEnd_toStartOf="@+id/item_estate_tv"
            android:orientation="horizontal"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent" />
            app:layout_constraintTop_toTopOf="parent">

            <TextView
                android:id="@+id/item_estate_tv"
                android:layout_width="7dp"
                android:layout_height="7dp"
                android:background="@drawable/device_state_ffb9b9b9" />

            <TextView
                android:id="@+id/item_content_tv"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:ellipsize="end"
                android:gravity="center_vertical|start"
                android:paddingStart="@dimen/dp_6"
                android:paddingEnd="@dimen/dp_20"
                android:singleLine="true"
                android:textColor="@color/text_FFACACAC"
                android:textSize="@dimen/text_14" />
        </LinearLayout>


        <TextView
            android:id="@+id/item_home_name_tv"
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_17"
            android:layout_marginTop="@dimen/dp_6"
            android:textColor="@color/text_66000000"
            android:layout_marginTop="14.5dp"
            android:textColor="@color/text_FF5B5B5B"
            android:textSize="@dimen/text_12"
            app:layout_constraintStart_toStartOf="@+id/item_content_tv"
            app:layout_constraintTop_toBottomOf="@+id/item_content_tv" />
            app:layout_constraintStart_toStartOf="@+id/ll"
            app:layout_constraintTop_toBottomOf="@+id/ll" />

        <TextView
            android:id="@+id/item_time_tv"
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_17"
            android:layout_marginTop="@dimen/dp_6"
            android:layout_marginTop="@dimen/dp_8"
            android:gravity="center_vertical"
            android:textColor="@color/text_66000000"
            android:textColor="@color/text_FF5B5B5B"
            android:textSize="@dimen/text_12"
            app:layout_constraintStart_toStartOf="@+id/item_home_name_tv"
            app:layout_constraintStart_toStartOf="@+id/ll"
            app:layout_constraintTop_toBottomOf="@+id/item_home_name_tv" />

        <TextView
            android:id="@+id/item_estate_tv"
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_33"
            android:background="@drawable/state_ffb300"
            android:gravity="center"
            android:paddingStart="@dimen/dp_12"
            android:paddingEnd="@dimen/dp_12"
            android:text="@string/message_alarm"
            android:textColor="@color/text_FFFFFFFF"
            android:textSize="@dimen/text_12"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintTop_toTopOf="parent" />

    </androidx.constraintlayout.widget.ConstraintLayout>

</androidx.constraintlayout.widget.ConstraintLayout>