From 57eea78f9841586d4d21e38537b5dddd6829f682 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 05 十一月 2025 15:15:58 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
keyCabinet-android/app/src/main/res/layout/face_activity.xml | 57 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/keyCabinet-android/app/src/main/res/layout/face_activity.xml b/keyCabinet-android/app/src/main/res/layout/face_activity.xml
index 53880b2..bd91c0e 100644
--- a/keyCabinet-android/app/src/main/res/layout/face_activity.xml
+++ b/keyCabinet-android/app/src/main/res/layout/face_activity.xml
@@ -17,6 +17,18 @@
android:background="@color/white"
>
+ <EditText
+ android:id="@+id/et_ewm"
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"
+ android:text=""
+ android:inputType="number"
+ app:layout_constraintTop_toTopOf="@+id/viewBack"
+ app:layout_constraintBottom_toBottomOf="@+id/viewBack"
+ app:layout_constraintStart_toStartOf="parent"
+ android:background="@null"
+ />
+
<View
android:id="@+id/viewBack"
android:layout_width="0dp"
@@ -482,20 +494,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:background="@color/white"
- android:visibility="visible">
-
- <EditText
- android:id="@+id/et_ewm"
- android:layout_width="100dp"
- android:layout_height="wrap_content"
- android:text=""
- android:inputType="number"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- android:background="@null"
- android:layout_marginTop="20dp"
- />
+ android:visibility="gone">
<View
android:id="@+id/v_c_sl"
@@ -703,10 +702,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_jiujin_ok"
- android:paddingLeft="80dp"
- android:paddingRight="80dp"
- android:paddingTop="50dp"
- android:paddingBottom="50dp"
+ android:paddingLeft="60dp"
+ android:paddingRight="60dp"
+ android:paddingTop="40dp"
+ android:paddingBottom="40dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -715,8 +714,8 @@
<pl.droidsonroids.gif.GifImageView
android:id="@+id/img_progress"
- android:layout_width="150dp"
- android:layout_height="150dp"
+ android:layout_width="90dp"
+ android:layout_height="90dp"
android:src="@mipmap/zhuanquan"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -736,5 +735,23 @@
</androidx.constraintlayout.widget.ConstraintLayout>
+ <TextView
+ android:id="@+id/message"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/activity_vertical_margin"
+ android:layout_marginRight="@dimen/activity_vertical_margin"
+ android:text=""
+ android:textColor="@color/white"
+ android:textSize="24sp"
+ android:padding="@dimen/activity_horizontal_margin"
+ android:background="@drawable/toast_view_bg"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ android:gravity="center"
+ android:visibility="gone"/>
+
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
--
Gitblit v1.9.3