From 0cc81c61f36d0072b6252737e3d106ba0d4518a3 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 31 十月 2025 10:10:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
keyCabinet-android/app/src/main/res/layout/face_activity.xml | 55 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 8 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 af37448..53880b2 100644
--- a/keyCabinet-android/app/src/main/res/layout/face_activity.xml
+++ b/keyCabinet-android/app/src/main/res/layout/face_activity.xml
@@ -482,7 +482,20 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:background="@color/white"
- android:visibility="gone">
+ 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"
+ />
<View
android:id="@+id/v_c_sl"
@@ -685,17 +698,43 @@
</androidx.constraintlayout.widget.ConstraintLayout>
-
- <EditText
- android:id="@+id/et_ewm"
- android:layout_width="100dp"
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/cl_jiujin_progress"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text=""
+ android:background="@drawable/shape_jiujin_ok"
+ android:paddingLeft="80dp"
+ android:paddingRight="80dp"
+ android:paddingTop="50dp"
+ android:paddingBottom="50dp"
app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- android:background="@null"
- />
+ android:visibility="gone">
+
+ <pl.droidsonroids.gif.GifImageView
+ android:id="@+id/img_progress"
+ android:layout_width="150dp"
+ android:layout_height="150dp"
+ android:src="@mipmap/zhuanquan"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ android:layout_marginBottom="30dp"/>
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="妫�娴嬩腑"
+ android:textColor="#ffffffff"
+ android:textSize="33sp"
+ app:layout_constraintTop_toBottomOf="@+id/img_progress"
+ android:layout_marginTop="10dp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"/>
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
--
Gitblit v1.9.3