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/CardOperationType.kt | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/generallibrary/src/main/java/com/dayu/general/tool/CardOperationType.kt b/generallibrary/src/main/java/com/dayu/general/tool/CardOperationType.kt
index efc0c1e..cfe0689 100644
--- a/generallibrary/src/main/java/com/dayu/general/tool/CardOperationType.kt
+++ b/generallibrary/src/main/java/com/dayu/general/tool/CardOperationType.kt
@@ -10,9 +10,19 @@
object CancelCard : CardOperationType(3, "閿�鍗�")
object ReplaceCard : CardOperationType(4, "琛ュ崱")
object DeductCard : CardOperationType(5, "琛ユ墸")
- object CleanCard : CardOperationType(6, "娓呴浂鍗�")
- object CheckCard : CardOperationType(7, "妫�鏌ュ崱")
- object ReturnCard : CardOperationType(8, "杩旇繕")
+ object SUPPLEMENT : CardOperationType(6, "杩旇繕")
+ object MANAGEMENT_CARD_WRITE : CardOperationType(7, "绠＄悊绫诲瀷鍗″啓鍗�")
+
+ // 绠＄悊鍗″埗浣滄搷浣滅被鍨嬶紙浣跨敤100+鐨勪唬鐮侊級
+ object RegionCardMake : CardOperationType(100, "鍒朵綔鍖哄煙琛ㄥ彿鍗�")
+ object CheckCardMake : CardOperationType(101, "鍒朵綔妫�鏌ュ崱")
+ object DebugCardMake : CardOperationType(102, "鍒朵綔璋冭瘯鍗�")
+ object CleanCardMake : CardOperationType(103, "鍒朵綔娓呴浂鍗�")
+ object IpCardMake : CardOperationType(104, "鍒朵綔IP璁剧疆鍗�")
+ object AreaCardMake : CardOperationType(105, "鍒朵綔鍩熷悕璁剧疆鍗�")
+ object GpsCardMake : CardOperationType(106, "鍒朵綔GPS鍗�")
+ object ValveTimeCardMake : CardOperationType(107, "鍒朵綔鏃堕棿閰嶇疆鍗�")
+ object ElectricPriceCardMake : CardOperationType(108, "鍒朵綔鍙栨暟鍗�")
companion object {
fun fromCode(code: Int): CardOperationType? {
@@ -22,9 +32,18 @@
3 -> CancelCard
4 -> ReplaceCard
5 -> DeductCard
- 6 -> CleanCard
- 7 -> CheckCard
- 8 -> ReturnCard
+ 6 -> SUPPLEMENT
+ 7 -> MANAGEMENT_CARD_WRITE
+ // 绠＄悊鍗″埗浣滄搷浣滅被鍨�
+ 100 -> RegionCardMake
+ 101 -> CheckCardMake
+ 102 -> DebugCardMake
+ 103 -> CleanCardMake
+ 104 -> IpCardMake
+ 105 -> AreaCardMake
+ 106 -> GpsCardMake
+ 107 -> ValveTimeCardMake
+ 108 -> ElectricPriceCardMake
else -> null
}
}
--
Gitblit v1.8.0