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连接逻辑，提高连接成功率
---
qihealonelibrary/src/main/res/layout/activity_admin_qha.xml | 94 +++++++++-------------------------------------
1 files changed, 19 insertions(+), 75 deletions(-)
diff --git a/qihealonelibrary/src/main/res/layout/activity_admin_qha.xml b/qihealonelibrary/src/main/res/layout/activity_admin_qha.xml
index d00d146..149320a 100644
--- a/qihealonelibrary/src/main/res/layout/activity_admin_qha.xml
+++ b/qihealonelibrary/src/main/res/layout/activity_admin_qha.xml
@@ -31,7 +31,7 @@
android:layout_marginTop="20dp"
android:padding="5dp"
android:text="鍒朵綔绠＄悊鍗�"
- android:textColor="@color/text_selecter"
+ android:textColor="@color/text_selecter_color"
android:textSize="@dimen/text_size" />
<TextView
@@ -42,91 +42,23 @@
android:layout_marginTop="20dp"
android:padding="5dp"
android:text="鍒朵綔娓呴浂鍗�"
- android:textColor="@color/text_selecter"
- android:textSize="@dimen/text_size" />
-
- <TextView
- android:id="@+id/admin_registered"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="20dp"
- android:layout_marginTop="20dp"
- android:padding="5dp"
android:visibility="gone"
- android:text="鍒朵綔閲嶆柊娉ㄥ唽璁惧鍗�"
- android:textColor="@color/text_selecter"
+ android:textColor="@color/text_selecter_color"
android:textSize="@dimen/text_size" />
- <TextView
- android:id="@+id/admin_CleanUser"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="20dp"
- android:layout_marginTop="20dp"
- android:padding="5dp"
- android:visibility="gone"
- android:text="鍒朵綔鍒犻櫎鍏ㄩ儴鐢ㄦ埛鍗�"
- android:textColor="@color/text_selecter"
- android:textSize="@dimen/text_size" />
-
- <TextView
- android:id="@+id/admin_domain"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="20dp"
- android:layout_marginTop="20dp"
- android:padding="5dp"
- android:text="鍒朵綔璁剧疆鍩熷悕鍗�"
- android:visibility="gone"
- android:textColor="@color/text_selecter"
- android:textSize="@dimen/text_size" />
-
-
- <TextView
- android:id="@+id/admin_test"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="20dp"
- android:layout_marginTop="20dp"
- android:padding="5dp"
- android:text="鍒朵綔娴嬭瘯鍗�"
- android:visibility="gone"
- android:textColor="@color/text_selecter"
- android:textSize="@dimen/text_size" />
-
- <TextView
- android:id="@+id/admin_configDeviceRegistration"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="20dp"
- android:layout_marginTop="20dp"
- android:padding="5dp"
- android:text="鍒朵綔閰嶇疆璁惧淇℃伅鍗�"
- android:visibility="gone"
- android:textColor="@color/text_selecter"
- android:textSize="@dimen/text_size" />
<TextView
android:id="@+id/admin_passWordCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
+ android:visibility="gone"
android:layout_marginTop="20dp"
android:padding="5dp"
android:text="鍒朵綔瀵嗙爜鍗�"
- android:textColor="@color/text_selecter"
+ android:textColor="@color/text_selecter_color"
android:textSize="@dimen/text_size" />
- <TextView
- android:id="@+id/admin_configPower"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="20dp"
- android:layout_marginTop="20dp"
- android:padding="5dp"
- android:text="鍒朵綔閰嶇疆姘存车鍔熺巼鍗�"
- android:textColor="@color/text_selecter"
- android:textSize="@dimen/text_size" />
<TextView
android:id="@+id/admin_blackCard"
@@ -136,8 +68,9 @@
android:layout_marginTop="20dp"
android:padding="5dp"
android:text="鍒朵綔榛戝崱"
- android:textColor="@color/text_selecter"
- android:textSize="@dimen/text_size" />
+ android:textColor="@color/text_selecter_color"
+ android:textSize="@dimen/text_size"
+ android:visibility="gone" />
<TextView
android:id="@+id/admin_regionCard"
@@ -147,7 +80,18 @@
android:layout_marginTop="20dp"
android:padding="5dp"
android:text="鍒朵綔鍖哄煙琛ㄥ彿鍗�"
- android:textColor="@color/text_selecter"
+ android:textColor="@color/text_selecter_color"
+ android:textSize="@dimen/text_size" />
+
+ <TextView
+ android:id="@+id/admin_electricCard"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="20dp"
+ android:layout_marginTop="20dp"
+ android:padding="5dp"
+ android:text="鍒朵綔鐢ㄦ埛鐢甸噺鍗曚环鍗�"
+ android:textColor="@color/text_selecter_color"
android:textSize="@dimen/text_size" />
</LinearLayout>
--
Gitblit v1.8.0