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/java/com/dayu/general/bean/net/NewCardInfo.kt |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/generallibrary/src/main/java/com/dayu/general/bean/net/NewCardInfo.kt b/generallibrary/src/main/java/com/dayu/general/bean/net/NewCardInfo.kt
index dd85942..6ceaf69 100644
--- a/generallibrary/src/main/java/com/dayu/general/bean/net/NewCardInfo.kt
+++ b/generallibrary/src/main/java/com/dayu/general/bean/net/NewCardInfo.kt
@@ -2,11 +2,11 @@
 
 // 鏀粯鏂瑰紡鏁版嵁绫�
 data class PaymentMethod(
-    val id: Long,
+    val id: String,
     val name: String
 )
 
-// 鏀粯鏂瑰紡鎺ュ彛杩斿洖鏁版嵁绫�
+// 鏀粯鏂瑰紡鎺ュ彛杩斿洖鏁版嵁绫伙紙鏃х増鏈紝淇濈暀鍏煎鎬э級
 data class PaymentMethodResponse(
     val itemTotal: Any?,
     val obj: List<PaymentMethod>,
@@ -15,6 +15,20 @@
     val pageTotal: Any?
 )
 
+// 鏀粯鏂瑰紡鍒楄〃鍖呰绫伙紝鐢ㄤ簬澶勭悊鐩存帴杩斿洖PaymentMethod鏁扮粍鐨勬帴鍙�
+// 杩欎釜绫诲疄闄呬笂鍙槸涓�涓畝鍗曠殑鍖呰鍣紝璁〨son鑳藉姝g‘瑙f瀽JSON鏁扮粍
+class PaymentMethodListResponse : ArrayList<PaymentMethod>() {
+    
+    companion object {
+        // 闈欐�佹柟娉曪紝浠嶭ist<PaymentMethod>鍒涘缓瀹炰緥
+        fun from(list: List<PaymentMethod>): PaymentMethodListResponse {
+            val response = PaymentMethodListResponse()
+            response.addAll(list)
+            return response
+        }
+    }
+}
+
 // 鐢ㄦ埛淇℃伅鏁版嵁绫�
 data class ClientInfo(
     val clientId: String,

--
Gitblit v1.8.0