Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -4,7 +4,7 @@
    android:id="@+id/message_parent"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@drawable/bj">
    android:background="@color/text_FF000000">
    <!--头部标签-->
    <RelativeLayout
        android:id="@+id/message_rl"
@@ -23,9 +23,8 @@
            android:layout_height="wrap_content"
            android:layout_centerVertical="true"
            android:text="@string/message_nascent"
            android:textColor="@color/text_E6000000"
            android:textSize="@dimen/text_20"
            android:textStyle="bold" />
            android:textColor="@color/text_FFACACAC"
            android:textSize="@dimen/text_18" />

        <TextView
            android:id="@+id/message_tab_recover_title_tv"
@@ -36,20 +35,17 @@
            android:layout_marginEnd="36dp"
            android:layout_toEndOf="@+id/message_tab_nascent_title_tv"
            android:text="@string/alarm_record"
            android:textColor="@color/text_66000000"
            android:textSize="@dimen/text_16"

            />
            android:textColor="@color/text_FF5B5B5B"
            android:textSize="@dimen/text_14" />

        <ImageView

            android:id="@+id/all_clear_iv"
            android:layout_width="@dimen/dp_28"
            android:layout_height="@dimen/dp_28"
            android:layout_width="@dimen/dp_33"
            android:layout_height="@dimen/dp_33"
            android:layout_alignParentEnd="true"
            android:layout_centerVertical="true"
            android:layout_marginTop="@dimen/dp_4"
            android:src="@drawable/clearall" />
            android:layout_marginEnd="@dimen/dp_5"
            android:src="@drawable/clear_all" />


    </RelativeLayout>
@@ -58,7 +54,7 @@
        android:id="@+id/message_cl"
        android:layout_width="match_parent"
        android:layout_height="98dp"
        android:layout_marginTop="@dimen/dp_13"
        android:layout_marginTop="@dimen/dp_10"
        android:orientation="vertical"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
@@ -80,7 +76,7 @@
                android:layout_height="match_parent"
                android:layout_alignParentEnd="true"
                android:layout_marginEnd="@dimen/dp_17"
                android:background="@drawable/search_bj_ff05000000">
                android:background="@drawable/search_bj_ff1c1c1e">

                <ImageView
                    android:id="@+id/power_station_search_iv"
@@ -94,12 +90,12 @@
                <TextView
                    android:id="@+id/power_station_search_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_17"
                    android:layout_height="wrap_content"
                    android:layout_centerVertical="true"
                    android:layout_marginStart="@dimen/dp_11"
                    android:layout_toEndOf="@+id/power_station_search_iv"
                    android:text="@string/enter_alarm_name"
                    android:textColor="@color/text_66000000"
                    android:textColor="@color/text_FF5B5B5B"
                    android:textSize="@dimen/text_14" />
            </RelativeLayout>

@@ -126,7 +122,7 @@
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_20"
                    android:text="@string/alarm_all_device"
                    android:textColor="@color/text_E6000000"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14" />

                <View
@@ -159,7 +155,7 @@
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_20"
                    android:text="@string/alarm_all_grade"
                    android:textColor="@color/text_E6000000"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14" />

                <View
@@ -191,7 +187,7 @@
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_20"
                    android:text="@string/alarm_all_time"
                    android:textColor="@color/text_E6000000"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14" />

                <View