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/tool/GeBaseHelper.kt | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/generallibrary/src/main/java/com/dayu/general/tool/GeBaseHelper.kt b/generallibrary/src/main/java/com/dayu/general/tool/GeBaseHelper.kt
index c2d4b5d..c007a9b 100644
--- a/generallibrary/src/main/java/com/dayu/general/tool/GeBaseHelper.kt
+++ b/generallibrary/src/main/java/com/dayu/general/tool/GeBaseHelper.kt
@@ -19,27 +19,29 @@
private external fun getM1SectorKeySecure(context: Context, sectorIndex: Int): String
init {
- try {
- // 鑾峰彇鎵�鏈夋墖鍖哄瘑閽�
- val allKeys: String = getM1SectorKeySecure(context, 0)
- if (allKeys.isNotEmpty()) {
- val keys: Array<String> = allKeys.split(",").dropLastWhile { it.isEmpty() }.toTypedArray()
- for (i in keys.indices) {
- val key = keys[i]
- if (key.isNotEmpty()) {
- listA_PS.add(HexUtil.hexToByteArray(key))
+ if(listA_PS.isEmpty()){
+ try {
+ // 鑾峰彇鎵�鏈夋墖鍖哄瘑閽�
+ val allKeys: String = getM1SectorKeySecure(context, 0)
+ if (allKeys.isNotEmpty()) {
+ val keys: Array<String> = allKeys.split(",").dropLastWhile { it.isEmpty() }.toTypedArray()
+ for (i in keys.indices) {
+ val key = keys[i]
+ if (key.isNotEmpty()) {
+ listA_PS.add(HexUtil.hexToByteArray(key))
+ }
}
}
+ defauleKey = HexUtil.hexToByteArray("FFFFFFFFFFFF")
+ } catch (e: Exception) {
+ e.printStackTrace()
+ // 璁剧疆榛樿瀵嗛挜
+ defauleKey = HexUtil.hexToByteArray("FFFFFFFFFFFF")
}
- defauleKey = HexUtil.hexToByteArray("FFFFFFFFFFFF")
- } catch (e: Exception) {
- e.printStackTrace()
- // 璁剧疆榛樿瀵嗛挜
- defauleKey = HexUtil.hexToByteArray("FFFFFFFFFFFF")
}
}
fun getKeyList(): List<ByteArray> {
- return listKeyA
+ return listA_PS
}
}
\ No newline at end of file
--
Gitblit v1.8.0