Merge branch '1.5.2' into dev

wjc

2025-04-09 87cd5df70918e6ba1af849c5f026d3719bfdb1ac

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

@@ -4,14 +4,14 @@
    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"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_36"
        android:layout_height="@dimen/dp_44"
        android:layout_marginStart="@dimen/dp_16"
        android:layout_marginTop="@dimen/dp_44"
        android:layout_marginTop="@dimen/dp_38"
        android:layout_marginEnd="@dimen/dp_16"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
@@ -20,46 +20,42 @@
        <TextView
            android:id="@+id/message_tab_nascent_title_tv"
            android:layout_width="wrap_content"
            android:layout_height="match_parent"
            android:layout_height="wrap_content"
            android:layout_centerVertical="true"
            android:gravity="center_vertical|bottom"
            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"
            android:layout_width="wrap_content"
            android:layout_height="match_parent"
            android:layout_height="wrap_content"
            android:layout_centerVertical="true"
            android:layout_marginStart="20dp"
            android:layout_marginEnd="4dp"
            android:layout_toStartOf="@+id/all_clear_iv"
            android:layout_marginEnd="36dp"
            android:layout_toEndOf="@+id/message_tab_nascent_title_tv"
            android:gravity="start|center_vertical|bottom"
            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_marginTop="@dimen/dp_4"
            android:src="@drawable/clearall" />
            android:layout_centerVertical="true"
            android:layout_marginEnd="@dimen/dp_5"
            android:src="@drawable/clear_all" />


    </RelativeLayout>

    <androidx.constraintlayout.widget.ConstraintLayout
    <LinearLayout
        android:id="@+id/message_cl"
        android:layout_width="match_parent"
        android:layout_height="98dp"
        android:layout_marginTop="@dimen/dp_21"
        android:layout_marginTop="@dimen/dp_10"
        android:orientation="vertical"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/message_rl">
@@ -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,143 +90,119 @@
                <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>


        </RelativeLayout>
        <!--条件筛选-->
        <RelativeLayout
            android:id="@+id/message_condition_screening_rl"
            android:layout_width="0dp"
        <LinearLayout
            android:id="@+id/message_tab_ll"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_62"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/message_search_cl">

            android:layout_marginStart="@dimen/dp_16"
            android:layout_marginEnd="@dimen/dp_16"
            android:orientation="horizontal">
            <!--全部设备-->
            <LinearLayout
                android:id="@+id/message_tab_ll"
                android:layout_width="match_parent"
                android:id="@+id/message_tab_all_device_cl"
                android:layout_width="wrap_content"
                android:layout_height="match_parent"
                android:layout_marginStart="@dimen/dp_16"
                android:layout_marginEnd="@dimen/dp_16"
                android:gravity="center_vertical"
                android:orientation="horizontal">
                <!--全部设备-->
                <androidx.constraintlayout.widget.ConstraintLayout
                    android:id="@+id/message_tab_all_device_cl"
                    android:layout_width="0dp"
                    android:layout_height="match_parent"
                    android:layout_weight="1">

                    <LinearLayout
                        android:layout_width="match_parent"
                        android:layout_height="match_parent"
                        android:gravity="center_vertical"
                        android:orientation="horizontal">
                <TextView
                    android:id="@+id/all_device_title_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_20"
                    android:text="@string/alarm_all_device"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14" />

                        <TextView
                            android:id="@+id/all_device_title_tv"
                            android:layout_width="wrap_content"
                            android:layout_height="@dimen/dp_20"
                            android:text="@string/alarm_all_device"
                            android:textColor="@color/text_E6000000"
                            android:textSize="@dimen/text_14" />
                <View
                    android:layout_width="@dimen/dp_5"
                    android:layout_height="match_parent" />

                        <View
                            android:layout_width="@dimen/dp_5"
                            android:layout_height="match_parent" />
                <ImageView
                    android:id="@+id/all_device_title_iv"
                    android:layout_width="@dimen/dp_10"
                    android:layout_height="@dimen/dp_10"
                    android:layout_marginStart="@dimen/dp_0"
                    android:background="@drawable/down" />

                        <ImageView
                            android:id="@+id/all_device_title_iv"
                            android:layout_width="@dimen/dp_10"
                            android:layout_height="@dimen/dp_10"
                            android:layout_marginStart="@dimen/dp_7"
                            android:background="@drawable/down" />

                    </LinearLayout>


                </androidx.constraintlayout.widget.ConstraintLayout>
                <!--全部等级-->
                <androidx.constraintlayout.widget.ConstraintLayout
                    android:id="@+id/message_tab_all_grade_cl"
                    android:layout_width="0dp"
                    android:layout_height="match_parent"
                    android:layout_weight="1">

                    <LinearLayout
                        android:layout_width="match_parent"
                        android:layout_height="match_parent"
                        android:gravity="center"
                        android:orientation="horizontal">

                        <TextView
                            android:id="@+id/all_grade_title_tv"
                            android:layout_width="wrap_content"
                            android:layout_height="@dimen/dp_20"
                            android:text="@string/alarm_all_grade"
                            android:textColor="@color/text_E6000000"
                            android:textSize="@dimen/text_14" />

                        <View
                            android:layout_width="5dp"
                            android:layout_height="match_parent" />

                        <ImageView
                            android:id="@+id/all_grade_title_iv"
                            android:layout_width="@dimen/dp_10"
                            android:layout_height="@dimen/dp_10"
                            android:layout_marginStart="@dimen/dp_7"
                            android:background="@drawable/down" />
                    </LinearLayout>


                </androidx.constraintlayout.widget.ConstraintLayout>
                <!--全部时间-->
                <androidx.constraintlayout.widget.ConstraintLayout
                    android:id="@+id/message_tab_all_time_cl"
                    android:layout_width="0dp"
                    android:layout_height="match_parent"
                    android:layout_weight="1">

                    <LinearLayout
                        android:layout_width="match_parent"
                        android:layout_height="match_parent"
                        android:gravity="center_vertical|end"
                        android:orientation="horizontal">

                        <TextView
                            android:id="@+id/all_time_title_tv"
                            android:layout_width="wrap_content"
                            android:layout_height="@dimen/dp_20"
                            android:layout_marginEnd="@dimen/dp_7"
                            android:text="@string/alarm_all_time"
                            android:textColor="@color/text_E6000000"
                            android:textSize="@dimen/text_14" />

                        <View
                            android:layout_width="@dimen/dp_5"
                            android:layout_height="match_parent" />

                        <ImageView
                            android:id="@+id/all_time_title_iv"
                            android:layout_width="@dimen/dp_10"
                            android:layout_height="@dimen/dp_10"
                            android:background="@drawable/down" />
                    </LinearLayout>


                </androidx.constraintlayout.widget.ConstraintLayout>
            </LinearLayout>
        </RelativeLayout>

    </androidx.constraintlayout.widget.ConstraintLayout>
            <View
                android:layout_width="0dp"
                android:layout_height="match_parent"
                android:layout_weight="1" />
            <!--全部等级-->
            <LinearLayout
                android:id="@+id/message_tab_all_grade_cl"
                android:layout_width="wrap_content"
                android:layout_height="match_parent"
                android:gravity="center"
                android:orientation="horizontal">

                <TextView
                    android:id="@+id/all_grade_title_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_20"
                    android:text="@string/alarm_all_grade"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14" />

                <View
                    android:layout_width="5dp"
                    android:layout_height="match_parent" />

                <ImageView
                    android:id="@+id/all_grade_title_iv"
                    android:layout_width="@dimen/dp_10"
                    android:layout_height="@dimen/dp_10"
                    android:layout_marginStart="@dimen/dp_0"
                    android:background="@drawable/down" />
            </LinearLayout>

            <View
                android:layout_width="0dp"
                android:layout_height="match_parent"
                android:layout_weight="1" />
            <!--全部时间-->
            <LinearLayout
                android:id="@+id/message_tab_all_time_cl"
                android:layout_width="wrap_content"
                android:layout_height="match_parent"
                android:gravity="center_vertical|end"
                android:orientation="horizontal">

                <TextView
                    android:id="@+id/all_time_title_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_20"
                    android:text="@string/alarm_all_time"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14" />

                <View
                    android:layout_width="@dimen/dp_5"
                    android:layout_height="match_parent" />

                <ImageView
                    android:id="@+id/all_time_title_iv"
                    android:layout_width="@dimen/dp_10"
                    android:layout_height="@dimen/dp_10"
                    android:background="@drawable/down" />
            </LinearLayout>
        </LinearLayout>

    </LinearLayout>


    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -242,12 +214,14 @@
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/message_cl">

        <!-- android:clipToPadding="false"
            android:paddingBottom="@dimen/dp_16"
            底部间距
            -->
        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/message_rcv"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:clipToPadding="false"
            android:paddingBottom="@dimen/dp_16" />
            android:layout_height="match_parent" />
    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

    <!--没有数据显示样式-->