From 5edfd12deb166302708857515a833d1471a0f208 Mon Sep 17 00:00:00 2001
From: zuoxiao <lf_zuo@163.com>
Date: 星期三, 25 六月 2025 16:15:23 +0800
Subject: [PATCH] feat(database): 增加管理卡相关功能并优化数据库结构- 新增 ManagerCardBean 数据类用于管理卡信息 - 在 AppDataBase 中添加 ManagerCardDao 接口 - 实现管理卡的数据库迁移策略 - 优化支付方式 ID 类型，从 Long改为 String - 重构更新写卡和上报状态的逻辑，支持管理卡和用户卡
---
generallibrary/src/main/java/com/dayu/general/tool/NfcReadHelper.kt | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/generallibrary/src/main/java/com/dayu/general/tool/NfcReadHelper.kt b/generallibrary/src/main/java/com/dayu/general/tool/NfcReadHelper.kt
index 84d7111..2466055 100644
--- a/generallibrary/src/main/java/com/dayu/general/tool/NfcReadHelper.kt
+++ b/generallibrary/src/main/java/com/dayu/general/tool/NfcReadHelper.kt
@@ -6,6 +6,7 @@
import android.widget.RelativeLayout
import com.dayu.baselibrary.tools.nfc.BaseNfcReadHelper
import com.dayu.baselibrary.tools.nfc.NfcReadAdapter
+import com.dayu.general.bean.card.UserCard
import com.pnikosis.materialishprogress.ProgressWheel
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
import io.reactivex.rxjava3.core.Observable
@@ -165,7 +166,7 @@
*/
fun getCardTypeAndCardNumber(): String {
return try {
- adapter.cradTypeAndCardNumber
+ adapter.getCradTypeAndCardNumber(7,0,8)
} catch (e: Exception) {
e.printStackTrace()
""
@@ -315,4 +316,27 @@
fun clearDisposables() {
compositeDisposable.clear()
}
-}
\ No newline at end of file
+
+ /**
+ * 璇诲彇鐢ㄦ埛鍗℃暟鎹�
+ * @return UserCard瀵硅薄锛屽鏋滆鍙栧け璐ュ垯杩斿洖null
+ */
+ fun getUserCardData(): UserCard? {
+ return try {
+ // 鑾峰彇鍩虹鍗℃暟鎹�
+ val baseCard = adapter.getUserCardData(7,UserCard())
+ // 濡傛灉鑾峰彇鎴愬姛涓旀槸UserCard绫诲瀷锛屽垯杩斿洖
+ if (baseCard is UserCard) {
+ baseCard
+ } else {
+ null
+ }
+ } catch (e: Exception) {
+ e.printStackTrace()
+ null
+ }
+ }
+
+
+}
+
--
Gitblit v1.8.0