From c3edd4a3122b711bc6a0bfef56b6ff6bf5ae03e2 Mon Sep 17 00:00:00 2001 From: zuoxiao <470321431@qq.com> Date: 星期二, 13 五月 2025 09:09:23 +0800 Subject: [PATCH] feat(generallibrary): 优化用户开卡流程并添加支付方式功能 --- 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