From ea8b02bbc2d20dc3db5b045fac4e6ddff7f44b7c Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期日, 29 九月 2024 10:30:10 +0800
Subject: [PATCH] 优化NFC模块架构，将一些方法抽调到父类中。修复一些bug
---
baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcReadAdapter.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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..f8d4288 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;
/**
@@ -21,7 +21,7 @@
public NfcReadAdapter(Intent intent, Activity activity) {
switch (BaseNfcActivity.adapterType) {
- case NfcCommonData.defaultType:
+ case ModelUtils.defaultType:
nativeNfcReadHelper = new NativeNfcReadHelper(intent, activity);
break;
}
@@ -31,7 +31,7 @@
@Override
public String getCradType() {
switch (BaseNfcActivity.adapterType) {
- case NfcCommonData.defaultType:
+ case ModelUtils.defaultType:
return nativeNfcReadHelper.getCradType();
}
@@ -41,7 +41,7 @@
@Override
public void getAllData(NFCCallMapback callback) {
switch (BaseNfcActivity.adapterType) {
- case NfcCommonData.defaultType:
+ case ModelUtils.defaultType:
nativeNfcReadHelper.getAllData(callback);
break;
@@ -51,7 +51,7 @@
@Override
public void getOneSectorData(NFCCallListback callback) {
switch (BaseNfcActivity.adapterType) {
- case NfcCommonData.defaultType:
+ case ModelUtils.defaultType:
nativeNfcReadHelper.getOneSectorData(callback);
break;
@@ -61,7 +61,7 @@
@Override
public String getCardNumber() {
switch (BaseNfcActivity.adapterType) {
- case NfcCommonData.defaultType:
+ case ModelUtils.defaultType:
return nativeNfcReadHelper.getCardNumber();
@@ -72,7 +72,7 @@
@Override
public String getCradTypeAndCardNumber() {
switch (BaseNfcActivity.adapterType) {
- case NfcCommonData.defaultType:
+ case ModelUtils.defaultType:
return nativeNfcReadHelper.getCradTypeAndCardNumber();
@@ -83,7 +83,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 +92,7 @@
@Override
public List<byte[]> getOnesectorData() {
switch (BaseNfcActivity.adapterType) {
- case NfcCommonData.defaultType:
+ case ModelUtils.defaultType:
return nativeNfcReadHelper.getOnesectorData();
@@ -103,7 +103,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