Merge branch '1.2.0'

wjc

2025-05-07 b9cc7390e8e8ce64c41c26fb369c98ce669d660c

 app/src/main/res/layout/activity_message_center_list.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_FF161616"
    android:background="@color/text_FF000000"
    tools:context=".ui.newC.MessageCenterList">

    <include
@@ -21,7 +21,8 @@
    <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">
@@ -43,9 +44,9 @@
                <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_E6FFFFFF"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
@@ -56,10 +57,7 @@
                    android:layout_width="@dimen/dp_10"
                    android:layout_height="@dimen/dp_10"
                    android:layout_marginStart="@dimen/dp_5"
                    android:background="@drawable/down"
                    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:background="@drawable/down" />


            </LinearLayout>
@@ -78,9 +76,9 @@
                <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_E6FFFFFF"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintEnd_toEndOf="parent"
@@ -92,10 +90,7 @@
                    android:layout_width="@dimen/dp_10"
                    android:layout_height="@dimen/dp_10"
                    android:layout_marginStart="@dimen/dp_5"
                    android:background="@drawable/down"
                    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:background="@drawable/down" />


            </LinearLayout>
@@ -114,10 +109,10 @@
                <TextView
                    android:id="@+id/all_time_title_tv"
                    android:layout_width="wrap_content"
                    android:layout_height="@dimen/dp_20"
                    android:layout_height="wrap_content"
                    android:layout_marginEnd="@dimen/dp_5"
                    android:text="@string/alarm_all_time"
                    android:textColor="@color/text_E6FFFFFF"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14"
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintEnd_toStartOf="@+id/all_time_title_iv"
@@ -127,10 +122,7 @@
                    android:id="@+id/all_time_title_iv"
                    android:layout_width="@dimen/dp_10"
                    android:layout_height="@dimen/dp_10"
                    android:background="@drawable/down"
                    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" />


            </LinearLayout>
@@ -138,10 +130,11 @@
    </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"
@@ -150,8 +143,10 @@
        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/message_content_rl"
            android:layout_width="match_parent"
            android:layout_height="match_parent" />
    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
            android:layout_height="match_parent"
            android:clipToPadding="false"
            android:paddingBottom="@dimen/dp_10" />
    </com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout>

    <!--没有数据显示样式-->
    <include
@@ -170,7 +165,7 @@
        android:id="@+id/message_bottom_cl"
        android:layout_width="match_parent"
        android:layout_height="64dp"
        android:background="@color/text_FF333738"
        android:background="@color/text_FF1C1C1E"
        android:orientation="vertical"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
@@ -191,23 +186,24 @@
                android:layout_width="0dp"
                android:layout_height="match_parent"
                android:layout_weight="1"
                android:gravity="center"
                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_E6FFFFFF"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14" />

                <View
                    android:id="@+id/message_bottom_alarm_device_line_v"
                    android:layout_width="18dp"
                    android:layout_height="3dp"
                    android:layout_gravity="center"
                    android:layout_marginTop="4.5dp"
                    android:background="@drawable/line_view" />

@@ -219,23 +215,24 @@
                android:layout_width="0dp"
                android:layout_height="match_parent"
                android:layout_weight="1"
                android:gravity="center"
                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_E6FFFFFF"
                    android:textColor="@color/text_FFACACAC"
                    android:textSize="@dimen/text_14" />

                <View
                    android:id="@+id/message_bottom_alarm_record_line_v"
                    android:layout_width="@dimen/dp_18"
                    android:layout_height="3dp"
                    android:layout_gravity="center"
                    android:layout_marginTop="4.5dp"
                    android:background="@drawable/line_view" />