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/activity/CardWriteSuccessActivity.kt | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/generallibrary/src/main/java/com/dayu/general/activity/CardWriteSuccessActivity.kt b/generallibrary/src/main/java/com/dayu/general/activity/CardWriteSuccessActivity.kt
index 5775875..9e08bf7 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/CardWriteSuccessActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/CardWriteSuccessActivity.kt
@@ -1,6 +1,7 @@
package com.dayu.general.activity
import android.os.Bundle
+import com.dayu.baselibrary.utils.MornyUtil
import com.dayu.general.bean.card.UserCard
import com.dayu.general.databinding.ActivityCardWriteSuccessBinding
import com.dayu.general.tool.CardOperationType
@@ -53,7 +54,7 @@
binding.successMessage.text = message
}
- CardOperationType.ReturnCard -> {
+ CardOperationType.SUPPLEMENT -> {
// 璁剧疆鏍囬
binding.titleBar.setCenterText("杩旇繕鎴愬姛")
@@ -85,11 +86,27 @@
binding.successMessage.text = message
}
+ CardOperationType.ReplaceCard -> {
+ // 璁剧疆鏍囬
+ binding.titleBar.setCenterText("琛ュ崱鎴愬姛")
+
+ // 璁剧疆鎴愬姛淇℃伅
+ binding.successTitle.text = "琛ュ崱鎴愬姛"
+
+ // 璁剧疆璇︾粏淇℃伅
+ val message = if (cardNumber.isNullOrBlank()) {
+ "琛ュ崱鎿嶄綔宸叉垚鍔熷畬鎴怽n鏂板崱宸插啓鍏ユ暟鎹紝鍙甯镐娇鐢�"
+ } else {
+ "琛ュ崱鎿嶄綔宸叉垚鍔熷畬鎴怽n鍗″彿锛�$cardNumber\n鏂板崱宸插啓鍏ユ暟鎹紝鍙甯镐娇鐢�"
+ }
+ binding.successMessage.text = message
+ }
+
CardOperationType.Recharge -> {
binding.titleBar.setCenterText("鍐欏崱鎴愬姛")
binding.successTitle.text = "鍐欏崱鎴愬姛"
binding.successMessage.text =
- "鍗″唴浣欓宸叉洿鏂颁负 ${userCard?.balance}鍏�"
+ "鍗″唴浣欓宸叉洿鏂颁负"+MornyUtil.changeF2Y(userCard?.balance?:0.toInt()) +"鍏�"
}
else -> {
--
Gitblit v1.8.0