From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'
---
app/src/main/res/layout/fragment_message.xml | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 2328091..f73f310 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,7 +23,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="@string/message_nascent"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_18" />
<TextView
@@ -35,7 +35,7 @@
android:layout_marginEnd="36dp"
android:layout_toEndOf="@+id/message_tab_nascent_title_tv"
android:text="@string/alarm_record"
- android:textColor="@color/text_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
<ImageView
@@ -45,7 +45,7 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_5"
- android:src="@drawable/clearall" />
+ android:src="@drawable/clear_all" />
</RelativeLayout>
@@ -76,7 +76,7 @@
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/dp_17"
- android:background="@drawable/search_bj_ff333738">
+ android:background="@drawable/search_bj_ff1c1c1e">
<ImageView
android:id="@+id/power_station_search_iv"
@@ -90,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_66FFFFFF"
+ android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/text_14" />
</RelativeLayout>
@@ -122,7 +122,7 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:text="@string/alarm_all_device"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<View
@@ -155,7 +155,7 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:text="@string/alarm_all_grade"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<View
@@ -187,7 +187,7 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
android:text="@string/alarm_all_time"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_14" />
<View
--
Gitblit v1.8.0