From 589d1dff2ce8554ee53b818a98db000df7fdf4e7 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 22 七月 2025 10:19:17 +0800
Subject: [PATCH] 2025年07月22日10:19:08
---
app/src/main/res/layout/fragment_message.xml | 51 ++++++++++++++++++++++++++-------------------------
1 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index beb5589..e181a31 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/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>
@@ -57,8 +53,8 @@
<LinearLayout
android:id="@+id/message_cl"
android:layout_width="match_parent"
- android:layout_height="98dp"
- android:layout_marginTop="@dimen/dp_13"
+ android:layout_height="77dp"
+ 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>
@@ -109,8 +105,9 @@
<LinearLayout
android:id="@+id/message_tab_ll"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_62"
+ android:layout_height="@dimen/dp_22"
android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_16"
android:orientation="horizontal">
<!--鍏ㄩ儴璁惧-->
@@ -126,7 +123,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 +156,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 +188,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
@@ -209,10 +206,11 @@
</LinearLayout>
- <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+ <com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout
android:id="@+id/message_srl"
android:layout_width="match_parent"
android:layout_height="0dp"
+ android:layout_marginTop="@dimen/dp_10"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -225,8 +223,11 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/message_rcv"
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
--
Gitblit v1.8.0