From 55b196ea2e28a8d859c85326f2147a4f7b7196de Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期四, 10 四月 2025 10:58:32 +0800
Subject: [PATCH] feat(general): 新增开卡信息保存功能并优化界面布局- 新增 CardRegistrationBean 数据模型用于保存开卡信息 - 在数据库中添加 card_registration 表用于存储开卡记录 - 优化 NewCard2Activity 界面布局，调整样式和间距 - 添加协程支持，实现异步保存开卡信息到数据库 - 更新颜色配置，统一使用新加的 base_blue_bg 和 base_green_bg颜色
---
generallibrary/src/main/java/com/dayu/general/tool/GeBaseHelper.kt | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 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 1a80899..c2d4b5d 100644
--- a/generallibrary/src/main/java/com/dayu/general/tool/GeBaseHelper.kt
+++ b/generallibrary/src/main/java/com/dayu/general/tool/GeBaseHelper.kt
@@ -1,19 +1,18 @@
package com.dayu.general.tool
import android.content.Context
-import android.util.Base64
import com.dayu.baselibrary.tools.HexUtil
import com.dayu.baselibrary.tools.nfc.BaseNFCHelper
-import java.nio.charset.StandardCharsets
-import javax.crypto.Cipher
-import javax.crypto.spec.SecretKeySpec
open class GeBaseHelper(private val context: Context) : BaseNFCHelper() {
-
companion object {
init {
- System.loadLibrary("general-native-lib")
+ try {
+ System.loadLibrary("general-native-lib")
+ } catch (e: UnsatisfiedLinkError) {
+ e.printStackTrace()
+ }
}
}
@@ -23,17 +22,20 @@
try {
// 鑾峰彇鎵�鏈夋墖鍖哄瘑閽�
val allKeys: String = getM1SectorKeySecure(context, 0)
- val keys: Array<String> =
- allKeys.split(",").dropLastWhile { it.isEmpty() }.toTypedArray()
- for (i in keys.indices) {
- val key = keys[i]
- listA_PS.add(HexUtil.hexToByteArray(key))
+ 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")
}
}
--
Gitblit v1.8.0