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/activity_message_center_list.xml | 144 ++++++++++++++++++++++++-----------------------
1 files changed, 73 insertions(+), 71 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 49427e2..2bbd37b 100644
--- a/app/src/main/res/layout/activity_message_center_list.xml
+++ b/app/src/main/res/layout/activity_message_center_list.xml
@@ -4,18 +4,24 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_EDEFF2"
+ android:background="@color/text_FF000000"
tools:context=".ui.newC.MessageCenterList">
<include
android:id="@+id/toolbar_top_message_center_list_rl"
- layout="@layout/toolbar_top_view_44" />
+ layout="@layout/toolbar_top_view_44"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_44"
+ android:layout_marginTop="@dimen/dp_38"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<RelativeLayout
android:id="@+id/message_rl"
android:layout_width="0dp"
- android:layout_height="@dimen/dp_70"
+ android:layout_height="@dimen/dp_60"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/toolbar_top_message_center_list_rl">
@@ -28,18 +34,18 @@
android:layout_marginEnd="@dimen/dp_16"
android:orientation="horizontal">
<!--鍏ㄩ儴璁惧-->
- <androidx.constraintlayout.widget.ConstraintLayout
+ <LinearLayout
android:id="@+id/message_tab_all_device_cl"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_weight="1">
+ android:gravity="center">
<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_E6000000"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -49,27 +55,29 @@
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"
- 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:layout_marginStart="@dimen/dp_5"
+ android:background="@drawable/down" />
- </androidx.constraintlayout.widget.ConstraintLayout>
- <!--鍏ㄩ儴绛夌骇-->
- <androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/message_tab_all_grade_cl"
+ </LinearLayout>
+
+ <View
android:layout_width="0dp"
android:layout_height="match_parent"
- android:layout_weight="1">
+ 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">
<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_E6000000"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -80,28 +88,30 @@
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"
- 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:layout_marginStart="@dimen/dp_5"
+ android:background="@drawable/down" />
- </androidx.constraintlayout.widget.ConstraintLayout>
- <!--鍏ㄩ儴鏃堕棿-->
- <androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/message_tab_all_time_cl"
+ </LinearLayout>
+
+ <View
android:layout_width="0dp"
android:layout_height="match_parent"
- android:layout_weight="1">
+ 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">
<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:layout_height="wrap_content"
+ android:layout_marginEnd="@dimen/dp_5"
android:text="@string/alarm_all_time"
- android:textColor="@color/text_E6000000"
+ android:textColor="@color/text_E6FFFFFF"
android:textSize="@dimen/text_14"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/all_time_title_iv"
@@ -111,13 +121,10 @@
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" />
- </androidx.constraintlayout.widget.ConstraintLayout>
+ </LinearLayout>
</LinearLayout>
</RelativeLayout>
@@ -150,91 +157,86 @@
app:layout_constraintTop_toBottomOf="@+id/message_rl" />
- <androidx.constraintlayout.widget.ConstraintLayout
+ <LinearLayout
android:id="@+id/message_bottom_cl"
android:layout_width="match_parent"
android:layout_height="64dp"
- android:background="@drawable/ffffff_18"
+ android:background="@color/text_FF1C1C1E"
+ android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0.5dp"
+ android:background="@color/text_1AFFFFFF" />
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_47"
- android:orientation="horizontal"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent">
+ android:orientation="horizontal">
<!--璁惧鎶ヨ-->
- <androidx.constraintlayout.widget.ConstraintLayout
+ <LinearLayout
android:id="@+id/message_bottom_alarm_device_cl"
android:layout_width="0dp"
android:layout_height="match_parent"
- android:layout_weight="1">
+ android:layout_weight="1"
+ 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_191919"
- android:textSize="@dimen/text_16"
- android:textStyle="bold"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ android:textColor="@color/text_E6FFFFFF"
+ 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="@color/text_191919"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="@+id/message_bottom_alarm_device_title_tv"
- app:layout_constraintStart_toStartOf="@+id/message_bottom_alarm_device_title_tv" />
+ android:background="@drawable/line_view" />
- </androidx.constraintlayout.widget.ConstraintLayout>
+ </LinearLayout>
<!--鎶ヨ璁板綍-->
- <androidx.constraintlayout.widget.ConstraintLayout
+ <LinearLayout
android:id="@+id/message_bottom_alarm_record_cl"
android:layout_width="0dp"
android:layout_height="match_parent"
- android:layout_weight="1">
+ android:layout_weight="1"
+ 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_191919"
- android:textSize="@dimen/text_16"
- android:textStyle="bold"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ android:textColor="@color/text_E6FFFFFF"
+ 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="@color/text_191919"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="@+id/message_bottom_alarm_record_title_tv"
- app:layout_constraintStart_toStartOf="@+id/message_bottom_alarm_record_title_tv" />
+ android:background="@drawable/line_view" />
- </androidx.constraintlayout.widget.ConstraintLayout>
+ </LinearLayout>
</LinearLayout>
- </androidx.constraintlayout.widget.ConstraintLayout>
+ </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0