From a8751388c9a86ae95714a15279994d8aa426a26d Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 13 六月 2025 14:59:02 +0800
Subject: [PATCH] feat(generallibrary): 优化充值功能并添加水价获取- 在 activity_recharge_detail.xml 中移除了不必要的 bold 样式- 在 EditText 中添加了金额输入限制（数字和小数点）- 在 BaseApplication 中添加了水价信息存储 - 在 MainActivity 中实现了延时获取水价的功能- 优化了 RechargeDetailActivity 中的水价检查和使用逻辑 - 在 README.md 中添加了金额格式化和水价获取的最佳实践指南
---
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