From d773ab0295feba24ae4fc14f61e8aa310e40f4ba Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期五, 06 六月 2025 16:55:57 +0800
Subject: [PATCH] refactor(nfc): 优化写卡流程和状态更新
---
generallibrary/src/main/java/com/dayu/general/tool/NfcWreatHelper.kt | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/generallibrary/src/main/java/com/dayu/general/tool/NfcWreatHelper.kt b/generallibrary/src/main/java/com/dayu/general/tool/NfcWreatHelper.kt
index 65fd920..b80183e 100644
--- a/generallibrary/src/main/java/com/dayu/general/tool/NfcWreatHelper.kt
+++ b/generallibrary/src/main/java/com/dayu/general/tool/NfcWreatHelper.kt
@@ -119,26 +119,28 @@
return false
}
+
+
/**
* 鍐欏崱(寮傛)
*
* @param userCard 鐢ㄦ埛鍗″唴瀹�
- * @param callback 鎿嶄綔缁撴灉鍥炶皟
+ * @param callBack 鎿嶄綔缁撴灉鍜屾秷鎭洖璋�
*/
- fun writeUserDataAsync(userCard: UserCard, callback: (Boolean) -> Unit): Disposable {
+ fun writeUserDataAsync(userCard: UserCard, callBack: NFCCallBack): Disposable {
showLoading()
val disposable = Observable.fromCallable {
- writeUserData(userCard)
+ writeUserData(userCard, callBack)
}
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe({ result ->
hideLoading()
- callback(result)
+ // 缁撴灉宸茬粡鍦╳riteUserData涓�氳繃callBack鍥炶皟浜�
}, { error ->
hideLoading()
error.printStackTrace()
- callback(false)
+ callBack.isSusses(false, "寮傛鍐欏崱寮傚父: ${error.message}")
})
compositeDisposable.add(disposable)
@@ -161,6 +163,22 @@
}
/**
+ * 鍐欏崱
+ *
+ * @param userCard 鐢ㄦ埛鍗″唴瀹�
+ * @param callBack 鍥炶皟鎺ュ彛
+ */
+ fun writeUserData(userCard: UserCard, callBack: NFCCallBack): Boolean {
+ try {
+ return adapter.writeUserData(userCard, 7, callBack)
+ } catch (e: java.lang.Exception) {
+ e.printStackTrace()
+ callBack.isSusses(false, "鍐欏崱寮傚父: ${e.message}")
+ }
+ return false
+ }
+
+ /**
* 淇敼瀵嗙爜(寮傛)
*
* @param ps 瀵嗙爜鍒楄〃
--
Gitblit v1.8.0