From 8c04e8e9e28f7fdf1df36f2630bd998d0acc746c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 21 十月 2024 14:01:41 +0800
Subject: [PATCH] 更新uniSDk后，Android14打开uni界面正常
---
app/src/main/res/layout/activity_message_info.xml | 76 +++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 33 deletions(-)
diff --git a/app/src/main/res/layout/activity_message_info.xml b/app/src/main/res/layout/activity_message_info.xml
index 988c9d4..1af0794 100644
--- a/app/src/main/res/layout/activity_message_info.xml
+++ b/app/src/main/res/layout/activity_message_info.xml
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_F5F7FA"
+ android:background="@color/text_FFECECEC"
tools:context=".ui.message.MessageInfoActivity">
<include
@@ -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,15 +70,17 @@
<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"
- layout="@layout/line_message_info" />
+ layout="@layout/line_message_info"
+ android:visibility="gone" />
<View
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_31" />
+ android:layout_height="@dimen/dp_33"
+ android:visibility="gone" />
<include
android:id="@+id/message_info_power_station_location_in"
@@ -86,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"
@@ -94,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