From dd0f9e5f533d868d68c5fc343a44356b537b3988 Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期五, 06 六月 2025 15:36:45 +0800
Subject: [PATCH] feat(nfc): 新增用户卡写入功能并优化开卡流程

---
 generallibrary/src/main/java/com/dayu/general/bean/card/UserCard.kt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/generallibrary/src/main/java/com/dayu/general/bean/card/UserCard.kt b/generallibrary/src/main/java/com/dayu/general/bean/card/UserCard.kt
index 9436dd7..7d16b06 100644
--- a/generallibrary/src/main/java/com/dayu/general/bean/card/UserCard.kt
+++ b/generallibrary/src/main/java/com/dayu/general/bean/card/UserCard.kt
@@ -12,7 +12,7 @@
  */
 class UserCard : BaseUserCardCard(), Serializable {
     var cardType: String = USER_CARD_TYPE_1 // 鍗$被鍨嬶細A1缁堢鍐欏崱 A8鍒峰崱寮�娉靛悗鍊� A2鍙犲姞鍏呭��
-    var areaNumber: Int = 0 // 鍥藉琛屾斂鍖哄煙鍙�(12浣岯CD,绮剧‘鍒版潙)
+    var areaNumber: String = "" // 鍥藉琛屾斂鍖哄煙鍙�(12浣岯CD,绮剧‘鍒版潙)
     var userCode: String = "" // 鐢ㄦ埛缂栧彿BCD
     var userCodeNumber: Int = 0 // 鐢ㄦ埛鍗$紪鍙�(HEX)
     var phoneNumber: String = "" // 鎵嬫満鍙�(BCD)
@@ -55,7 +55,7 @@
             userCard.apply {
                 // 瑙f瀽鍥藉琛屾斂鍖哄煙鍙�(0-5浣�)
                 val areaCodeBytes = zero.copyOfRange(0, 6)
-                areaNumber = BcdUtil.bcdToStr(areaCodeBytes).toInt()
+                areaNumber = BcdUtil.bcdToStr(areaCodeBytes)
 
                 // 瑙f瀽鐢ㄦ埛鍗$紪鍙�(6-7浣�)
                 val userCodeNumberBytes = zero.copyOfRange(6, 8)

--
Gitblit v1.8.0