Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -63,8 +63,8 @@
                android:background="@null"
                android:gravity="start|center_vertical"
                android:hint="@string/enter_the_device_sn_and_device_name"
                android:textColor="@color/text_E6FFFFFF"
                android:textColorHint="@color/text_66FFFFFF"
                android:textColor="@color/text_FFACACAC"
                android:textColorHint="@color/text_FF5B5B5B"
                android:textSize="@dimen/text_14" />

            <ImageView
@@ -86,7 +86,7 @@
            android:layout_marginEnd="@dimen/dp_21"
            android:gravity="center"
            android:text="@string/search"
            android:textColor="@color/text_E6FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_14" />


@@ -109,7 +109,7 @@
            android:layout_marginTop="@dimen/dp_23"
            android:layout_marginEnd="@dimen/dp_21"
            android:text="@string/history_search"
            android:textColor="@color/text_E6FFFFFF"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_16"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent" />