From b9cc7390e8e8ce64c41c26fb369c98ce669d660c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 15:02:30 +0800
Subject: [PATCH] Merge branch '1.2.0'

---
 app/src/main/res/layout/activity_message_center_list.xml |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/src/main/res/layout/activity_message_center_list.xml b/app/src/main/res/layout/activity_message_center_list.xml
index 9c099f1..93a1cb5 100644
--- a/app/src/main/res/layout/activity_message_center_list.xml
+++ b/app/src/main/res/layout/activity_message_center_list.xml
@@ -21,7 +21,8 @@
     <RelativeLayout
         android:id="@+id/message_rl"
         android:layout_width="0dp"
-        android:layout_height="@dimen/dp_60"
+        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">
@@ -45,7 +46,7 @@
                     android:layout_width="wrap_content"
                     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"
@@ -77,7 +78,7 @@
                     android:layout_width="wrap_content"
                     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"
@@ -111,7 +112,7 @@
                     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"
@@ -129,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"
@@ -141,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
@@ -182,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" />
 
@@ -210,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" />
 

--
Gitblit v1.8.0