From 32d1501e6fe6338eb6dc51c26df7fe0808caac0d Mon Sep 17 00:00:00 2001
From: zuoxiao <lf_zuo@163.com>
Date: 星期四, 26 六月 2025 15:05:28 +0800
Subject: [PATCH] feat(general): 优化写卡成功界面并添加开卡功能- 重新设计写卡成功界面布局，增加滚动视图以支持长文本显示 - 添加开卡功能相关的UI和逻辑，包括工本费和充值金额的展示- 增加用户姓名和卡片信息的显示 - 优化打印凭证的内容和格式 -调整NFC连接逻辑，提高连接成功率
---
generallibrary/src/main/res/layout/activity_card_write_success.xml | 112 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 69 insertions(+), 43 deletions(-)
diff --git a/generallibrary/src/main/res/layout/activity_card_write_success.xml b/generallibrary/src/main/res/layout/activity_card_write_success.xml
index 2fa9734..c2ca3d0 100644
--- a/generallibrary/src/main/res/layout/activity_card_write_success.xml
+++ b/generallibrary/src/main/res/layout/activity_card_write_success.xml
@@ -22,67 +22,93 @@
android:layout_marginStart="16dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="16dp"
- android:layout_marginBottom="80dp"
+ android:layout_marginBottom="24dp"
app:cardBackgroundColor="@android:color/white"
app:cardCornerRadius="12dp"
app:cardElevation="4dp"
- app:layout_constraintBottom_toTopOf="@id/btnConfirm"
+ app:layout_constraintBottom_toTopOf="@id/buttonContainer"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/titleBar">
- <LinearLayout
+ <ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:gravity="center"
- android:orientation="vertical"
- android:padding="32dp">
+ android:fillViewport="true">
- <ImageView
- android:id="@+id/successIcon"
- android:layout_width="150dp"
- android:layout_height="150dp"
- android:scaleType="fitCenter"
- android:src="@drawable/icon_success" />
-
- <TextView
- android:id="@+id/successTitle"
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="24dp"
- android:text="鍐欏崱鎴愬姛"
- android:textColor="#4CAF50"
- android:textSize="24sp"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/successMessage"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="16dp"
android:gravity="center"
- android:text="鍗＄墖淇℃伅宸叉垚鍔熷啓鍏n璇峰Ε鍠勪繚绠℃偍鐨勫崱鐗�"
- android:textColor="#666666"
- android:textSize="16sp"
- android:lineSpacingExtra="4dp" />
+ android:orientation="vertical"
+ android:padding="24dp"
+ android:minHeight="300dp">
- </LinearLayout>
+ <ImageView
+ android:id="@+id/successIcon"
+ android:layout_width="120dp"
+ android:layout_height="120dp"
+ android:scaleType="fitCenter"
+ android:src="@drawable/icon_success" />
+
+ <TextView
+ android:id="@+id/successTitle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="20dp"
+ android:text="鍐欏崱鎴愬姛"
+ android:textColor="#4CAF50"
+ android:textSize="22sp"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/successMessage"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="12dp"
+ android:gravity="center"
+ android:text="鍗＄墖淇℃伅宸叉垚鍔熷啓鍏n璇峰Ε鍠勪繚绠℃偍鐨勫崱鐗�"
+ android:textColor="#666666"
+ android:textSize="15sp"
+ android:lineSpacingExtra="4dp" />
+
+ </LinearLayout>
+ </ScrollView>
</androidx.cardview.widget.CardView>
- <Button
- android:id="@+id/btnConfirm"
+ <LinearLayout
+ android:id="@+id/buttonContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="32dp"
- android:layout_marginEnd="32dp"
- android:layout_marginBottom="24dp"
- android:background="@drawable/bg_button_primary"
- android:text="纭畾"
- android:textColor="@android:color/white"
- android:textSize="18sp"
- android:textStyle="bold"
+ android:orientation="vertical"
+ android:paddingStart="32dp"
+ android:paddingEnd="32dp"
+ android:paddingBottom="24dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
+ app:layout_constraintStart_toStartOf="parent">
+
+ <Button
+ android:id="@+id/btnReprint"
+ android:layout_width="match_parent"
+ android:layout_height="44dp"
+ android:layout_marginBottom="12dp"
+ android:background="@drawable/bg_button_outline_selector"
+ android:text="鍐嶆鎵撳嵃"
+ android:textColor="#2196F3"
+ android:textSize="16sp"
+ android:textStyle="bold" />
+
+ <Button
+ android:id="@+id/btnConfirm"
+ android:layout_width="match_parent"
+ android:layout_height="48dp"
+ android:background="@drawable/bg_button_primary"
+ android:text="纭畾"
+ android:textColor="@android:color/white"
+ android:textSize="18sp"
+ android:textStyle="bold" />
+
+ </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0