From c870de9e4207c7af37229cb24b9ca0e2d1e1215f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 09 十二月 2024 15:09:00 +0800
Subject: [PATCH] Merge branch '1.5.0' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into 1.5.0
---
app/src/main/res/layout/dialog_confirmation_tip.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/app/src/main/res/layout/dialog_confirmation_tip.xml b/app/src/main/res/layout/dialog_confirmation_tip.xml
index 094f768..3622d70 100644
--- a/app/src/main/res/layout/dialog_confirmation_tip.xml
+++ b/app/src/main/res/layout/dialog_confirmation_tip.xml
@@ -8,7 +8,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="280dp"
- android:layout_height="229dp"
+ android:layout_height="wrap_content"
android:background="@drawable/confirmation_bj"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -58,8 +58,8 @@
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_20"
- android:singleLine="false"
android:gravity="center"
+ android:singleLine="false"
android:textColor="@color/text_030D1C"
android:textSize="12sp"
android:visibility="gone"
@@ -81,5 +81,12 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/content_cl" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_16"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/comfirm_tv" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0