From dd2562d8dc2b01bcdfca3152f82f09efbbd09259 Mon Sep 17 00:00:00 2001
From: zuoxiao <lf_zuo@163.com>
Date: 星期三, 25 六月 2025 19:49:48 +0800
Subject: [PATCH] fix(generallibrary): 优化卡片处理和支付方式获取逻辑- 修复地区卡处理逻辑，增加对"00"类型卡的特殊处理 - 优化用户卡数据解析和显示逻辑，提高容错性 - 改进支付方式获取方法，增加错误处理和日志记录 -调整充值接口调用参数，确保正确传递当前余额等信息- 修复 AreaCard 中 areaNumber 类型，改为字符串处理
---
generallibrary/src/main/java/com/dayu/general/tool/NfcWreatHelper.kt | 40 ++++++----------------------------------
1 files changed, 6 insertions(+), 34 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 d224bbf..c4ad095 100644
--- a/generallibrary/src/main/java/com/dayu/general/tool/NfcWreatHelper.kt
+++ b/generallibrary/src/main/java/com/dayu/general/tool/NfcWreatHelper.kt
@@ -78,24 +78,20 @@
* @param b 涔﹀啓鐨勫潡(浠�0寮�濮嬫暟)
* @param callback 鎿嶄綔缁撴灉鍥炶皟
*/
- fun writeDataAsync(str: ByteArray?, a: Int, b: Int, callback: (Boolean) -> Unit): Disposable {
+ fun writeDataAsync(str: ByteArray?, a: Int, b: Int, callback: NFCCallBack): Disposable {
showLoading()
val disposable = Observable.fromCallable {
- writeData(str, a, b, object : NFCCallBack {
- override fun isSusses(flag: Boolean, msg: String?) {
- // 杩欎釜鍥炶皟鍦↖O绾跨▼涓紝涓嶅鐞哢I鐩稿叧鎿嶄綔
- }
- })
+ writeData(str, a, b, callback)
}
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe({ result ->
hideLoading()
- callback(result)
+ callback.isSusses(result, if (result) "鍐欏崱鎴愬姛" else "鍐欏崱澶辫触")
}, { error ->
hideLoading()
error.printStackTrace()
- callback(false)
+ callback.isSusses(false, "鍐欏崱寮傚父: ${error.message}")
})
compositeDisposable.add(disposable)
@@ -112,38 +108,14 @@
*/
fun writeData(str: ByteArray?, a: Int, b: Int, callBack: NFCCallBack): Boolean {
try {
- return adapter.writeData(str, a, b, false, callBack)
+ return adapter.writeData(str, a, b, true, callBack)
} catch (e: Exception) {
e.printStackTrace()
}
return false
}
- /**
- * 鍐欏崱(寮傛)
- *
- * @param userCard 鐢ㄦ埛鍗″唴瀹�
- * @param callback 鎿嶄綔缁撴灉鍥炶皟
- */
- fun writeUserDataAsync(userCard: UserCard, callback: (Boolean) -> Unit): Disposable {
- showLoading()
- val disposable = Observable.fromCallable {
- writeUserData(userCard)
- }
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe({ result ->
- hideLoading()
- callback(result)
- }, { error ->
- hideLoading()
- error.printStackTrace()
- callback(false)
- })
-
- compositeDisposable.add(disposable)
- return disposable
- }
+
/**
* 鍐欏崱(寮傛)
--
Gitblit v1.8.0