Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -4,37 +4,50 @@
    android:layout_width="match_parent"
    android:layout_height="@dimen/dp_127">

    <ImageView
        android:id="@+id/message_search_iv"
        android:layout_width="@dimen/dp_18"
        android:layout_height="@dimen/dp_18"
        android:layout_marginStart="@dimen/dp_16"
        android:src="@drawable/search_path"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />
    <!--    <ImageView-->
    <!--        android:id="@+id/message_search_iv"-->
    <!--        android:layout_width="@dimen/dp_18"-->
    <!--        android:layout_height="@dimen/dp_18"-->
    <!--        android:layout_marginStart="@dimen/dp_16"-->
    <!--        android:src="@drawable/search_path"-->
    <!--        app:layout_constraintStart_toStartOf="parent"-->
    <!--        app:layout_constraintTop_toTopOf="parent" />-->

    <androidx.constraintlayout.widget.ConstraintLayout
        android:layout_width="match_parent"
        android:layout_width="0dp"
        android:layout_height="@dimen/dp_99"
        android:layout_marginStart="@dimen/dp_57"
        android:layout_marginStart="@dimen/dp_16"
        android:layout_marginEnd="@dimen/dp_21"
        android:background="@drawable/bj_13fffffff"
        android:background="@drawable/search_bj_ff1c1c1e"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">


        <TextView
            android:id="@+id/message_state_tv"
            android:layout_width="7dp"
            android:layout_height="7dp"
            android:layout_marginStart="@dimen/dp_16"
            android:layout_marginTop="22.5dp"
            android:background="@drawable/device_state_ffb9b9b9"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent" />

        <TextView
            android:id="@+id/message_name_tv"
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_23"
            android:layout_marginStart="@dimen/dp_16"
            android:layout_marginTop="@dimen/dp_19"
            android:layout_width="0dp"
            android:layout_height="@dimen/dp_20"
            android:layout_marginStart="6dp"
            android:layout_marginTop="16dp"
            android:layout_marginEnd="@dimen/dp_5"
            android:ellipsize="end"
            android:gravity="center_vertical"
            android:singleLine="true"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_16"
            android:textStyle="bold"
            app:layout_constraintStart_toStartOf="parent"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_14"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toEndOf="@+id/message_state_tv"
            app:layout_constraintTop_toTopOf="parent" />

        <TextView
@@ -42,9 +55,9 @@
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_17"
            android:layout_marginTop="@dimen/dp_6"
            android:textColor="@color/text_66000000"
            android:textColor="@color/text_FF5B5B5B"
            android:textSize="@dimen/text_12"
            app:layout_constraintStart_toStartOf="@+id/message_name_tv"
            app:layout_constraintStart_toStartOf="@+id/message_state_tv"
            app:layout_constraintTop_toBottomOf="@+id/message_name_tv" />

        <TextView
@@ -52,23 +65,11 @@
            android:layout_width="wrap_content"
            android:layout_height="@dimen/dp_17"
            android:layout_marginTop="@dimen/dp_6"
            android:textColor="@color/text_66000000"
            android:textColor="@color/text_FF5B5B5B"
            android:textSize="@dimen/text_12"
            app:layout_constraintStart_toStartOf="@+id/message_content_tv"
            app:layout_constraintStart_toStartOf="@+id/message_state_tv"
            app:layout_constraintTop_toBottomOf="@+id/message_content_tv" />

        <TextView
            android:id="@+id/message_state_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: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>