Merge branch '1.2.0'

wjc

2025-05-07 b9cc7390e8e8ce64c41c26fb369c98ce669d660c

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

@@ -4,18 +4,25 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="@color/text_EDEFF2"
    android:background="@color/text_FF000000"
    tools:context=".ui.newC.MessageCenterList">

    <include
        android:id="@+id/toolbar_top_message_center_list_rl"
        layout="@layout/toolbar_top_view_44" />
        layout="@layout/toolbar_top_view_44"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_44"
        android:layout_marginTop="@dimen/dp_38"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />


    <RelativeLayout
        android:id="@+id/message_rl"
        android:layout_width="0dp"
        android:layout_height="@dimen/dp_70"
        android:layout_height="@dimen/dp_22"
        android:layout_marginTop="@dimen/dp_20"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/toolbar_top_message_center_list_rl">
@@ -28,18 +35,18 @@
            android:layout_marginEnd="@dimen/dp_16"
            android:orientation="horizontal">
            <!--全部设备-->
            <androidx.constraintlayout.widget.ConstraintLayout
            <LinearLayout
                android:id="@+id/message_tab_all_device_cl"
                android:layout_width="0dp"
                android:layout_width="wrap_content"
                android:layout_height="match_parent"
                android:layout_weight="1">
                android:gravity="center">

                <TextView
                    android:id="@+id/all_device_title_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_20"
                    android:layout_height="wrap_content"
                    android:text="@string/alarm_all_device"
                    android:textColor="@color/text_E6000000"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
@@ -49,27 +56,29 @@
                    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/up"
                    app:layout_constraintBottom_toBottomOf="@+id/all_device_title_tv"
                    app:layout_constraintStart_toEndOf="@+id/all_device_title_tv"
                    app:layout_constraintTop_toTopOf="@+id/all_device_title_tv" />
                    android:layout_marginStart="@dimen/dp_5"
                    android:background="@drawable/down" />


            </androidx.constraintlayout.widget.ConstraintLayout>
            <!--全部等级-->
            <androidx.constraintlayout.widget.ConstraintLayout
                android:id="@+id/message_tab_all_grade_cl"
            </LinearLayout>

            <View
                android:layout_width="0dp"
                android:layout_height="match_parent"
                android:layout_weight="1">
                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">

                <TextView
                    android:id="@+id/all_grade_title_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_20"
                    android:layout_height="wrap_content"
                    android:text="@string/alarm_all_grade"
                    android:textColor="@color/text_E6000000"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintEnd_toEndOf="parent"
@@ -80,28 +89,30 @@
                    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/up"
                    app:layout_constraintBottom_toBottomOf="@+id/all_grade_title_tv"
                    app:layout_constraintStart_toEndOf="@+id/all_grade_title_tv"
                    app:layout_constraintTop_toTopOf="@+id/all_grade_title_tv" />
                    android:layout_marginStart="@dimen/dp_5"
                    android:background="@drawable/down" />


            </androidx.constraintlayout.widget.ConstraintLayout>
            <!--全部时间-->
            <androidx.constraintlayout.widget.ConstraintLayout
                android:id="@+id/message_tab_all_time_cl"
            </LinearLayout>

            <View
                android:layout_width="0dp"
                android:layout_height="match_parent"
                android:layout_weight="1">
                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">

                <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:layout_height="wrap_content"
                    android:layout_marginEnd="@dimen/dp_5"
                    android:text="@string/alarm_all_time"
                    android:textColor="@color/text_E6000000"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintEnd_toStartOf="@+id/all_time_title_iv"
@@ -111,21 +122,19 @@
                    android:id="@+id/all_time_title_iv"
                    android:layout_width="@dimen/dp_10"
                    android:layout_height="@dimen/dp_10"
                    android:background="@drawable/up"
                    app:layout_constraintBottom_toBottomOf="@+id/all_time_title_tv"
                    app:layout_constraintEnd_toEndOf="parent"
                    app:layout_constraintTop_toTopOf="@+id/all_time_title_tv" />
                    android:background="@drawable/down" />


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


    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
    <com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout
        android:id="@+id/message_content_srl"
        android:layout_width="match_parent"
        android:layout_height="0dp"
        android:layout_marginTop="@dimen/dp_10"
        app:layout_constraintBottom_toTopOf="@+id/message_bottom_cl"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
@@ -136,8 +145,8 @@
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:clipToPadding="false"
            android:paddingBottom="@dimen/dp_16" />
    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
            android:paddingBottom="@dimen/dp_10" />
    </com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout>

    <!--没有数据显示样式-->
    <include
@@ -152,91 +161,86 @@
        app:layout_constraintTop_toBottomOf="@+id/message_rl" />


    <androidx.constraintlayout.widget.ConstraintLayout
    <LinearLayout
        android:id="@+id/message_bottom_cl"
        android:layout_width="match_parent"
        android:layout_height="82dp"
        android:background="@color/text_FFFFFFFF"
        android:layout_height="64dp"
        android:background="@color/text_FF1C1C1E"
        android:orientation="vertical"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent">

        <View
            android:layout_width="match_parent"
            android:layout_height="0.5dp"
            android:background="@color/text_1AFFFFFF" />

        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_49"
            android:orientation="horizontal"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent">
            android:layout_height="@dimen/dp_47"
            android:orientation="horizontal">
            <!--设备报警-->
            <androidx.constraintlayout.widget.ConstraintLayout
            <LinearLayout
                android:id="@+id/message_bottom_alarm_device_cl"
                android:layout_width="0dp"
                android:layout_height="match_parent"
                android:layout_weight="1">
                android:layout_weight="1"
                android:orientation="vertical">

                <TextView
                    android:id="@+id/message_bottom_alarm_device_title_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_20"
                    android:layout_gravity="center"
                    android:layout_marginTop="@dimen/dp_16"
                    android:gravity="center"
                    android:text="@string/alarm_device"
                    android:textColor="@color/text_191919"
                    android:textSize="@dimen/text_14"
                    android:textStyle="bold"
                    app:layout_constraintEnd_toEndOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toTopOf="parent" />
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14" />

                <View
                    android:id="@+id/message_bottom_alarm_device_line_v"
                    android:layout_width="0dp"
                    android:layout_width="18dp"
                    android:layout_height="3dp"
                    android:layout_marginTop="@dimen/dp_11"
                    android:background="@color/text_191919"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintEnd_toEndOf="@+id/message_bottom_alarm_device_title_tv"
                    app:layout_constraintStart_toStartOf="@+id/message_bottom_alarm_device_title_tv" />
                    android:layout_gravity="center"
                    android:layout_marginTop="4.5dp"
                    android:background="@drawable/line_view" />


            </androidx.constraintlayout.widget.ConstraintLayout>
            </LinearLayout>
            <!--报警记录-->
            <androidx.constraintlayout.widget.ConstraintLayout
            <LinearLayout
                android:id="@+id/message_bottom_alarm_record_cl"
                android:layout_width="0dp"
                android:layout_height="match_parent"
                android:layout_weight="1">
                android:layout_weight="1"
                android:orientation="vertical">

                <TextView
                    android:id="@+id/message_bottom_alarm_record_title_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_20"
                    android:layout_gravity="center"
                    android:layout_marginTop="@dimen/dp_16"
                    android:gravity="center"
                    android:text="@string/alarm_record"
                    android:textColor="@color/text_191919"
                    android:textSize="@dimen/text_14"
                    android:textStyle="bold"
                    app:layout_constraintEnd_toEndOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toTopOf="parent" />
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14" />

                <View
                    android:id="@+id/message_bottom_alarm_record_line_v"
                    android:layout_width="0dp"
                    android:layout_width="@dimen/dp_18"
                    android:layout_height="3dp"
                    android:layout_marginTop="@dimen/dp_11"
                    android:background="@color/text_191919"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintEnd_toEndOf="@+id/message_bottom_alarm_record_title_tv"
                    app:layout_constraintStart_toStartOf="@+id/message_bottom_alarm_record_title_tv" />
                    android:layout_gravity="center"
                    android:layout_marginTop="4.5dp"
                    android:background="@drawable/line_view" />


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

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


</androidx.constraintlayout.widget.ConstraintLayout>