From 8521954fa97bdfc54123afb4a72755ece311db06 Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期五, 21 三月 2025 14:45:45 +0800
Subject: [PATCH] feat(general): 更新登录逻辑和用户信息展示
---
baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NativeNfcReadHelper.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 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 bcad792..c7a5200 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,6 +53,7 @@
*
* @return
*/
+ @Override
public BaseUserCardCard getUserCardData(BaseUserCardCard userCardCard) {
if (userCardCard!=null){
BaseUserCardCard userCard = null;
@@ -117,6 +118,7 @@
return null;
}
+ @Override
public String getCradType() {
MifareClassic mfc = MifareClassic.get(tag);
@@ -161,6 +163,7 @@
*
* @param callback
*/
+ @Override
public void getAllData(final NFCCallMapback callback) {
Map<String, List<byte[]>> map = new HashMap<>();
MifareClassic mfc = MifareClassic.get(tag);
@@ -232,6 +235,7 @@
*
* @param callback
*/
+ @Override
public void getOneSectorData(NFCCallListback callback) {
@@ -305,6 +309,7 @@
* @param b 鍧�
* @param callback
*/
+ @Override
public void getData(final int a, final int b, final NFCCallByteback callback) {
new Thread(new Runnable() {
@Override
@@ -381,12 +386,19 @@
mfc.connect();
//鑾峰彇褰撳墠鍗″彿
boolean isOpen = false;
- for (int i = 0; i < listKeyA.size(); i++) {
- if (mfc.authenticateSectorWithKeyA(0, listKeyA.get(i))) {
+ if (!listKeyA.isEmpty()){
+ for (int i = 0; i < listKeyA.size(); i++) {
+ if (mfc.authenticateSectorWithKeyA(0, listKeyA.get(i))) {
+ isOpen = true;
+ break;
+ }
+ }
+ }else if (!listA_PS.isEmpty()){
+ if (mfc.authenticateSectorWithKeyA(0, listA_PS.get(0))){
isOpen = true;
- break;
}
}
+
if (isOpen) {
int bIndex = mfc.sectorToBlock(0);
byte[] data = mfc.readBlock(bIndex + 0);
@@ -543,6 +555,7 @@
*
* @return
*/
+ @Override
public BaseManagerToUserCard getManagerToUserCardData(BaseManagerToUserCard baseManagerToUserCard) {
BaseManagerToUserCard managerToUserCard = null;
--
Gitblit v1.8.0