From bd4891e2fd6b773cbb0ec387f6db4bc944fdf51a Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 31 三月 2025 18:07:51 +0800
Subject: [PATCH] feat(generallibrary): 添加卡片列表功能并优化登录逻辑
---
baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcReadAdapter.java | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcReadAdapter.java b/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcReadAdapter.java
index fcbae8b..ba423c5 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcReadAdapter.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcReadAdapter.java
@@ -5,8 +5,8 @@
import com.dayu.baselibrary.activity.BaseNfcActivity;
import com.dayu.baselibrary.bean.BaseUserCardCard;
+import com.dayu.baselibrary.utils.ModelUtils;
-import java.util.Collections;
import java.util.List;
/**
@@ -19,9 +19,14 @@
NativeNfcReadHelper nativeNfcReadHelper;
+ @Override
+ public void setIntent(Intent intent) {
+ nativeNfcReadHelper.setIntent(intent);
+ }
+
public NfcReadAdapter(Intent intent, Activity activity) {
switch (BaseNfcActivity.adapterType) {
- case NfcCommonData.defaultType:
+ case ModelUtils.defaultType:
nativeNfcReadHelper = new NativeNfcReadHelper(intent, activity);
break;
}
@@ -31,7 +36,7 @@
@Override
public String getCradType() {
switch (BaseNfcActivity.adapterType) {
- case NfcCommonData.defaultType:
+ case ModelUtils.defaultType:
return nativeNfcReadHelper.getCradType();
}
@@ -41,7 +46,7 @@
@Override
public void getAllData(NFCCallMapback callback) {
switch (BaseNfcActivity.adapterType) {
- case NfcCommonData.defaultType:
+ case ModelUtils.defaultType:
nativeNfcReadHelper.getAllData(callback);
break;
@@ -51,7 +56,7 @@
@Override
public void getOneSectorData(NFCCallListback callback) {
switch (BaseNfcActivity.adapterType) {
- case NfcCommonData.defaultType:
+ case ModelUtils.defaultType:
nativeNfcReadHelper.getOneSectorData(callback);
break;
@@ -61,18 +66,26 @@
@Override
public String getCardNumber() {
switch (BaseNfcActivity.adapterType) {
- case NfcCommonData.defaultType:
+ case ModelUtils.defaultType:
return nativeNfcReadHelper.getCardNumber();
-
-
}
return "";
}
+
+ public String getCardNumberNoClose() {
+ switch (BaseNfcActivity.adapterType) {
+ case ModelUtils.defaultType:
+ return nativeNfcReadHelper.getCardNumberNoClose();
+ }
+ return "";
+ }
+
+
@Override
public String getCradTypeAndCardNumber() {
switch (BaseNfcActivity.adapterType) {
- case NfcCommonData.defaultType:
+ case ModelUtils.defaultType:
return nativeNfcReadHelper.getCradTypeAndCardNumber();
@@ -83,7 +96,7 @@
@Override
public void getData(int a, int b, NFCCallByteback callback) {
switch (BaseNfcActivity.adapterType) {
- case NfcCommonData.defaultType:
+ case ModelUtils.defaultType:
nativeNfcReadHelper.getData(a, b, callback);
break;
}
@@ -92,7 +105,7 @@
@Override
public List<byte[]> getOnesectorData() {
switch (BaseNfcActivity.adapterType) {
- case NfcCommonData.defaultType:
+ case ModelUtils.defaultType:
return nativeNfcReadHelper.getOnesectorData();
@@ -103,7 +116,7 @@
@Override
public BaseUserCardCard getUserCardData(BaseUserCardCard userCardCard) {
switch (BaseNfcActivity.adapterType) {
- case NfcCommonData.defaultType:
+ case ModelUtils.defaultType:
return nativeNfcReadHelper.getUserCardData(userCardCard);
}
return null;
--
Gitblit v1.8.0