From 90d5f028ccdaaaf64286f9d632cb335a4d0544b9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 一月 2025 09:40:52 +0800
Subject: [PATCH] Merge branch '1.5.1'
---
app/src/main/res/layout/fragment_message.xml | 239 ++++++++++++++++++++++++++---------------------------------
1 files changed, 106 insertions(+), 133 deletions(-)
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 2b5d3cc..3064492 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_E6FFFFFF"
+ android:textSize="@dimen/text_18" />
<TextView
android:id="@+id/message_tab_recover_title_tv"
@@ -36,29 +35,27 @@
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_66FFFFFF"
+ 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>
- <androidx.constraintlayout.widget.ConstraintLayout
+ <LinearLayout
android:id="@+id/message_cl"
android:layout_width="match_parent"
android:layout_height="98dp"
- android:layout_marginTop="@dimen/dp_13"
+ android:layout_marginTop="@dimen/dp_10"
+ android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/message_rl">
@@ -79,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"
@@ -93,143 +90,119 @@
<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_66FFFFFF"
android:textSize="@dimen/text_14" />
</RelativeLayout>
</RelativeLayout>
<!--鏉′欢绛涢��-->
- <RelativeLayout
- android:id="@+id/message_condition_screening_rl"
- android:layout_width="0dp"
+ <LinearLayout
+ android:id="@+id/message_tab_ll"
+ android:layout_width="match_parent"
android:layout_height="@dimen/dp_62"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/message_search_cl">
-
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginEnd="@dimen/dp_16"
+ android:orientation="horizontal">
+ <!--鍏ㄩ儴璁惧-->
<LinearLayout
- android:id="@+id/message_tab_ll"
- android:layout_width="match_parent"
+ android:id="@+id/message_tab_all_device_cl"
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_marginStart="@dimen/dp_16"
- android:layout_marginEnd="@dimen/dp_16"
+ android:gravity="center_vertical"
android:orientation="horizontal">
- <!--鍏ㄩ儴璁惧-->
- <androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/message_tab_all_device_cl"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1">
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center_vertical"
- android:orientation="horizontal">
+ <TextView
+ android:id="@+id/all_device_title_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_20"
+ android:text="@string/alarm_all_device"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
- <TextView
- android:id="@+id/all_device_title_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_20"
- android:text="@string/alarm_all_device"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_14" />
+ <View
+ android:layout_width="@dimen/dp_5"
+ android:layout_height="match_parent" />
- <View
- android:layout_width="@dimen/dp_5"
- android:layout_height="match_parent" />
+ <ImageView
+ android:id="@+id/all_device_title_iv"
+ android:layout_width="@dimen/dp_10"
+ android:layout_height="@dimen/dp_10"
+ android:layout_marginStart="@dimen/dp_0"
+ android:background="@drawable/down" />
- <ImageView
- 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/down" />
-
- </LinearLayout>
-
-
- </androidx.constraintlayout.widget.ConstraintLayout>
- <!--鍏ㄩ儴绛夌骇-->
- <androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/message_tab_all_grade_cl"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center"
- android:orientation="horizontal">
-
- <TextView
- android:id="@+id/all_grade_title_tv"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_20"
- android:text="@string/alarm_all_grade"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_14" />
-
- <View
- android:layout_width="5dp"
- android:layout_height="match_parent" />
-
- <ImageView
- 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/down" />
- </LinearLayout>
-
-
- </androidx.constraintlayout.widget.ConstraintLayout>
- <!--鍏ㄩ儴鏃堕棿-->
- <androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/message_tab_all_time_cl"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center_vertical|end"
- android:orientation="horizontal">
-
- <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:text="@string/alarm_all_time"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_14" />
-
- <View
- android:layout_width="@dimen/dp_5"
- android:layout_height="match_parent" />
-
- <ImageView
- android:id="@+id/all_time_title_iv"
- android:layout_width="@dimen/dp_10"
- android:layout_height="@dimen/dp_10"
- android:background="@drawable/down" />
- </LinearLayout>
-
-
- </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
- </RelativeLayout>
- </androidx.constraintlayout.widget.ConstraintLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ 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"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/all_grade_title_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_20"
+ android:text="@string/alarm_all_grade"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
+
+ <View
+ android:layout_width="5dp"
+ android:layout_height="match_parent" />
+
+ <ImageView
+ android:id="@+id/all_grade_title_iv"
+ android:layout_width="@dimen/dp_10"
+ android:layout_height="@dimen/dp_10"
+ android:layout_marginStart="@dimen/dp_0"
+ android:background="@drawable/down" />
+ </LinearLayout>
+
+ <View
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ 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_vertical|end"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/all_time_title_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_20"
+ android:text="@string/alarm_all_time"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
+
+ <View
+ android:layout_width="@dimen/dp_5"
+ android:layout_height="match_parent" />
+
+ <ImageView
+ android:id="@+id/all_time_title_iv"
+ android:layout_width="@dimen/dp_10"
+ android:layout_height="@dimen/dp_10"
+ android:background="@drawable/down" />
+ </LinearLayout>
+ </LinearLayout>
+
+ </LinearLayout>
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
--
Gitblit v1.8.0