Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -4,7 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_FFECECEC"
    android:background="@color/text_FF000000"
    tools:context=".ui.powerstation.DeviceSearchActivity">

    <!--搜索-->
@@ -24,12 +24,12 @@

            <ImageView
                android:id="@+id/power_station_back_iv"
                android:layout_width="@dimen/dp_10"
                android:layout_height="@dimen/dp_17"
                android:layout_width="@dimen/dp_30"
                android:layout_height="@dimen/dp_30"
                android:layout_alignParentStart="true"
                android:layout_centerVertical="true"
                android:layout_marginStart="@dimen/dp_16"
                android:src="@drawable/search_back" />
                android:layout_marginStart="@dimen/dp_10"
                android:src="@drawable/back" />
        </RelativeLayout>


@@ -40,7 +40,7 @@
            android:layout_marginEnd="@dimen/dp_21"
            android:layout_toStartOf="@+id/power_station_search_tv"
            android:layout_toEndOf="@+id/back_rl"
            android:background="@drawable/search_bj_ff05000000">
            android:background="@drawable/search_bj_ff1c1c1e">

            <ImageView
                android:id="@+id/power_station_search_iv"
@@ -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_E6000000"
                android:textColorHint="@color/text_66000000"
                android:textColor="@color/text_FFACACAC"
                android:textColorHint="@color/text_FF5B5B5B"
                android:textSize="@dimen/text_14" />

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


    </RelativeLayout>
@@ -109,9 +109,8 @@
            android:layout_marginTop="@dimen/dp_23"
            android:layout_marginEnd="@dimen/dp_21"
            android:text="@string/history_search"
            android:textColor="@color/text_E6000000"
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_16"
            android:textStyle="bold"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent" />