From 08bfe3072377b53c60e0952f00c26bce2e5b4bc0 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 18 六月 2025 17:05:55 +0800
Subject: [PATCH] feat(card): 添加卡片返还功能- 新增 CardReturnActivity 用于执行卡片返还操作 - 在 BSCardFragment 中添加返还按钮，跳转到 CardReturnActivity - 在 CardOperationType 中添加 ReturnCard 类型 - 修改 CardReadActivity，优化卡片信息显示逻辑 - 更新 CardWriteSuccessActivity，支持返还成功提示 - 新增 ic_morny_back 图标用于返还操作
---
generallibrary/src/main/java/com/dayu/general/bean/card/FetchDataCard.kt | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/generallibrary/src/main/java/com/dayu/general/bean/card/FetchDataCard.kt b/generallibrary/src/main/java/com/dayu/general/bean/card/FetchDataCard.kt
index 3d5d658..77aeb50 100644
--- a/generallibrary/src/main/java/com/dayu/general/bean/card/FetchDataCard.kt
+++ b/generallibrary/src/main/java/com/dayu/general/bean/card/FetchDataCard.kt
@@ -2,6 +2,8 @@
import com.dayu.baselibrary.tools.BcdUtil
import com.dayu.baselibrary.tools.HexUtil
+import com.dayu.general.tool.CardCommon.Companion.ELECTRIC_PRICE_CARD
+import com.dayu.general.tool.CardCommon.Companion.MANAGE_CRAD
import java.io.Serializable
/**
@@ -10,12 +12,9 @@
*/
class FetchDataCard : BaseCard(), Serializable {
companion object {
- const val CARD_TYPE_NEED_FETCH = "B1" // 闇�瑕佸埛鍗″彇鏁�
- const val CARD_TYPE_FETCH_SUCCESS = "B2" // 鍒峰崱鍙栨暟杩斿啓鎴愬姛
- const val IDENTIFY_CODE_A0 = 0xA0.toByte() // 璇嗗埆鐮丄0
- const val IDENTIFY_CODE_B1 = 0xB1.toByte() // 璇嗗埆鐮丅1
- const val IDENTIFY_CODE_C2 = 0xC2.toByte() // 璇嗗埆鐮丆2
- const val IDENTIFY_CODE_89 = 0x89.toByte() // 璇嗗埆鐮�89
+ const val CARD_TYPE_NEED_FETCH = ELECTRIC_PRICE_CARD // 闇�瑕佸埛鍗″彇鏁�
+ const val CARD_TYPE_FETCH_SUCCESS = MANAGE_CRAD // 鍒峰崱鍙栨暟杩斿啓鎴愬姛
+
}
var areaNumber: Int = 0 // 鍥藉琛屾斂鍖哄煙鍙�(12浣岯CD,绮剧‘鍒版潙)
--
Gitblit v1.8.0