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/model/CardInfoModel.kt | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/generallibrary/src/main/java/com/dayu/general/model/CardInfoModel.kt b/generallibrary/src/main/java/com/dayu/general/model/CardInfoModel.kt
index f089095..48beaf6 100644
--- a/generallibrary/src/main/java/com/dayu/general/model/CardInfoModel.kt
+++ b/generallibrary/src/main/java/com/dayu/general/model/CardInfoModel.kt
@@ -1,28 +1,34 @@
package com.dayu.general.model
-import androidx.lifecycle.MutableLiveData
+import androidx.databinding.ObservableField
import androidx.lifecycle.ViewModel
class CardInfoModel : ViewModel() {
- val cardNumber = MutableLiveData<String>()
- val remark = MutableLiveData<String>()
- val regionNumber = MutableLiveData<String>()
+ val cardNumber = ObservableField<String>()
+ val remark = ObservableField<String>()
+ val regionNumber = ObservableField<String>()
+ val projectNumber = ObservableField<String>()
init {
- cardNumber.value = ""
- remark.value = ""
- regionNumber.value = ""
+ cardNumber.set("")
+ remark.set("")
+ regionNumber.set("")
+ projectNumber.set("")
}
fun setCardNumber(number: String) {
- cardNumber.value = number
+ cardNumber.set(number)
}
fun setRemark(remarkText: String) {
- remark.value = remarkText
+ remark.set(remarkText)
}
fun setRegionNumber(regionNum: String) {
- regionNumber.value = regionNum
+ regionNumber.set(regionNum)
+ }
+
+ fun setProjectNumber(projectNum: String) {
+ projectNumber.set(projectNum)
}
}
\ No newline at end of file
--
Gitblit v1.8.0