From e91dd3b590040b2c961e0d778c265f326228257a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 09 十月 2024 10:41:23 +0800
Subject: [PATCH] 2024年10月09日10:41:07
---
app/src/main/res/layout/activity_message_info.xml | 68 +++++++++++++++++++---------------
1 files changed, 38 insertions(+), 30 deletions(-)
diff --git a/app/src/main/res/layout/activity_message_info.xml b/app/src/main/res/layout/activity_message_info.xml
index d438f23..1af0794 100644
--- a/app/src/main/res/layout/activity_message_info.xml
+++ b/app/src/main/res/layout/activity_message_info.xml
@@ -62,7 +62,7 @@
<View
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_31" />
+ android:layout_height="@dimen/dp_33" />
<include
android:id="@+id/message_info_alarm_device_in"
@@ -70,7 +70,7 @@
<View
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_31" />
+ android:layout_height="@dimen/dp_33" />
<!--浜у搧璇寸‖浠舵病鍋� 闅愯棌鎺� 2024骞�05鏈�28鏃�13:46:53-->
<include
android:id="@+id/message_info_alarm_range_in"
@@ -79,7 +79,7 @@
<View
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_31"
+ android:layout_height="@dimen/dp_33"
android:visibility="gone" />
<include
@@ -88,7 +88,7 @@
<View
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_31" />
+ android:layout_height="@dimen/dp_33" />
<include
android:id="@+id/message_info_alarm_time_in"
@@ -96,41 +96,49 @@
<View
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_31" />
+ android:layout_height="@dimen/dp_18" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
-
- <TextView
- android:id="@+id/message_info_back_tv"
- android:layout_width="157.5dp"
- android:layout_height="@dimen/dp_52"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_marginBottom="54.5dp"
- android:background="@drawable/fillet_line_00000000"
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="82dp"
android:gravity="center"
- android:text="@string/message_alarm_details_back"
- android:textColor="@color/text_FF245EC3"
- android:textSize="@dimen/text_18"
+ android:orientation="horizontal"
+ android:paddingStart="@dimen/dp_20"
+ android:paddingEnd="@dimen/dp_20"
+ android:background="@color/ffffff"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent">
- <TextView
- android:id="@+id/message_info_solve_tv"
- android:layout_width="157.5dp"
- android:layout_height="@dimen/dp_52"
- android:layout_marginEnd="@dimen/dp_20"
- android:layout_marginBottom="54.5dp"
- android:background="@drawable/checked"
- android:gravity="center"
- android:text="@string/message_alarm_details_resolved"
- android:textColor="@color/text_FFFFFFFF"
- android:textSize="@dimen/text_18"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent" />
+ <TextView
+ android:id="@+id/message_info_back_tv"
+ android:layout_width="157.5dp"
+ android:layout_height="@dimen/dp_52"
+ android:background="@drawable/fillet_line_00000000"
+ android:gravity="center"
+ android:text="@string/message_alarm_details_back"
+ android:textColor="@color/text_FF245EC3"
+ android:textSize="@dimen/text_18" />
+
+ <View
+ android:layout_width="@dimen/dp_20"
+ android:layout_height="match_parent" />
+
+ <TextView
+ android:id="@+id/message_info_solve_tv"
+ android:layout_width="157.5dp"
+ android:layout_height="@dimen/dp_52"
+ android:background="@drawable/checked"
+ android:gravity="center"
+ android:text="@string/message_alarm_details_resolved"
+ android:textColor="@color/text_FFFFFFFF"
+ android:textSize="@dimen/text_18" />
+ </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0