Merge branch '1.5.2' into dev

wjc

2025-04-09 87cd5df70918e6ba1af849c5f026d3719bfdb1ac

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

@@ -20,7 +20,7 @@
        android:layout_height="@dimen/dp_99"
        android:layout_marginStart="@dimen/dp_16"
        android:layout_marginEnd="@dimen/dp_21"
        android:background="@drawable/bj_ff333738"
        android:background="@drawable/bj_ff1c1c1e"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">
@@ -32,9 +32,7 @@
            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" />
            android:background="@drawable/device_state_ffb9b9b9" />

        <TextView
            android:id="@+id/device_search_name_tv"
@@ -43,14 +41,12 @@
            android:layout_marginStart="6dp"
            android:layout_marginTop="16dp"
            android:layout_marginEnd="@dimen/dp_5"
            android:layout_toEndOf="@+id/device_search_state_tv"
            android:ellipsize="end"
            android:gravity="center_vertical"
            android:gravity="center_vertical|start"
            android:singleLine="true"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toEndOf="@+id/device_search_state_tv"
            app:layout_constraintTop_toTopOf="parent" />
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_14" />


        <TextView
@@ -60,8 +56,9 @@
            android:layout_below="@+id/device_search_name_tv"
            android:layout_alignStart="@+id/device_search_state_tv"
            android:layout_marginTop="@dimen/dp_6"
            android:layout_toEndOf="@+id/device_search_name_tv"
            android:gravity="center_vertical"
            android:textColor="@color/text_66FFFFFF"
            android:textColor="@color/text_FF5B5B5B"
            android:textSize="@dimen/text_12" />

        <TextView
@@ -72,7 +69,7 @@
            android:layout_alignStart="@+id/device_search_state_tv"
            android:layout_marginTop="@dimen/dp_6"
            android:gravity="center_vertical"
            android:textColor="@color/text_66FFFFFF"
            android:textColor="@color/text_FF5B5B5B"
            android:textSize="@dimen/text_12" />

    </RelativeLayout>