From 0faae97cd2523f840c426da68464e577e01dfa80 Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期一, 23 六月 2025 20:35:08 +0800
Subject: [PATCH] refactor(CardReplaceActivity): 重构补卡流程并优化界面显示- 重新设计卡片信息展示布局，增加新卡卡地址、客户编号等字段 - 优化补卡逻辑，支持通过卡号或客户编号获取卡片信息 -调整工本费和返回金额输入框位置 - 更新API调用路径，使用新的卡片查询接口
---
baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NativeNfcReadHelper.java | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NativeNfcReadHelper.java b/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NativeNfcReadHelper.java
index cb24575..93ac8c3 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NativeNfcReadHelper.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NativeNfcReadHelper.java
@@ -53,13 +53,18 @@
return helper;
}
+
+ public BaseUserCardCard getUserCardData( BaseUserCardCard userCardCard) {
+ return getUserCardData(1, userCardCard);
+ }
+
/**
* 鑾峰彇鐢ㄦ埛鍗′俊鎭�
*
* @return
*/
@Override
- public BaseUserCardCard getUserCardData(BaseUserCardCard userCardCard) {
+ public BaseUserCardCard getUserCardData(int sectorIndex, BaseUserCardCard userCardCard) {
if (userCardCard != null) {
BaseUserCardCard userCard = null;
Map<String, List<byte[]>> map = new HashMap<>();
@@ -68,26 +73,31 @@
try {
//閾炬帴NFC
mfc.connect();
- //鑾峰彇鎵囧尯鏁伴噺
- int count = mfc.getSectorCount();
- //瀛樺偍绌洪棿
- int size = mfc.getSize();
+
//鐢ㄤ簬鍒ゆ柇鏃跺�欐湁鍐呭璇诲彇鍑烘潵
boolean flag = false;
List<byte[]> list = new ArrayList<>();
//楠岃瘉鎵囧尯瀵嗙爜锛屽惁鍒欎細鎶ラ敊锛堥摼鎺ュけ璐ラ敊璇級
boolean isOpen = false;
- for (int i = 0; i < listKeyA.size(); i++) {
- if (mfc.authenticateSectorWithKeyA(1, listKeyA.get(i))) {
+ if (!listKeyA.isEmpty()) {
+ for (int i = 0; i < listKeyA.size(); i++) {
+ if (mfc.authenticateSectorWithKeyA(sectorIndex, listKeyA.get(i))) {
+ isOpen = true;
+ break;
+ }
+ }
+ } else if (!listA_PS.isEmpty()) {
+ if (mfc.authenticateSectorWithKeyA(sectorIndex, defauleKey)) {
isOpen = true;
- break;
+ } else if (mfc.authenticateSectorWithKeyA(sectorIndex, listA_PS.get(sectorIndex))) {
+ isOpen = true;
}
}
if (isOpen) {
//鑾峰彇鎵囧尯閲岄潰鍧楃殑鏁伴噺
- int bCount = mfc.getBlockCountInSector(1);
+ int bCount = mfc.getBlockCountInSector(sectorIndex);
//鑾峰彇鎵囧尯绗竴涓潡瀵瑰簲鑺墖瀛樺偍鍣ㄧ殑浣嶇疆锛堟垜鏄繖鏍风悊瑙ｇ殑锛屽洜涓虹0鎵囧尯鐨勮繖涓�兼槸4鑰屼笉鏄�0锛�
- int bIndex = mfc.sectorToBlock(1);
+ int bIndex = mfc.sectorToBlock(sectorIndex);
//String data1 = "";
for (int j = 0; j < bCount; j++) {
//璇诲彇鏁版嵁
@@ -482,7 +492,7 @@
@Override
public String getCradTypeAndCardNumber() {
- return getCradTypeAndCardNumber(1);
+ return getCradTypeAndCardNumber(1, 0, 0);
}
@@ -492,7 +502,7 @@
* @return
*/
- public String getCradTypeAndCardNumber(int sectorIndex) {
+ public String getCradTypeAndCardNumber(int sectorIndex, int blockIndex, int cardTypeIndex) {
MifareClassic mfc = MifareClassic.get(tag);
if (null != mfc) {
@@ -544,9 +554,9 @@
}
if (isOpen) {
int bIndex = mfc.sectorToBlock(sectorIndex);
- byte[] data = mfc.readBlock(bIndex + sectorIndex);
+ byte[] data = mfc.readBlock(bIndex + 0);
if (data != null && data.length > 0) {
- String hex = HexUtil.byteToHex(data[0]);
+ String hex = HexUtil.byteToHex(data[cardTypeIndex]);
strData.append(hex);
Log.i("NFCWreatActivity", "hex===" + hex);
return strData.toString().toUpperCase();
@@ -556,6 +566,7 @@
return BaseCommon.CARD_TYPE_ERROR2;
}
} catch (IOException e) {
+ e.printStackTrace();
return BaseCommon.CARD_TYPE_ERROR1;
} finally {
try {
@@ -693,8 +704,6 @@
}
return null;
}
-
-
}
--
Gitblit v1.8.0