From d08a5a6d062f1568aaeb14d2d72357826291ef97 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期六, 13 七月 2024 18:14:28 +0800
Subject: [PATCH] 添加齐河管理卡相关逻辑 修复bug
---
henanlibrary/src/main/java/com/dayu/henanlibrary/tools/NfcReadHelper.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/tools/NfcReadHelper.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/tools/NfcReadHelper.java
index 05b26f1..cd8c1bd 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/tools/NfcReadHelper.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/tools/NfcReadHelper.java
@@ -8,8 +8,9 @@
import android.util.Log;
import com.dayu.baselibrary.tools.HexUtil;
+import com.dayu.baselibrary.utils.BaseCommon;
import com.dayu.henanlibrary.card.UserCard;
-import com.dayu.henanlibrary.utils.MyCommon;
+import com.dayu.henanlibrary.utils.CardCommon;
import java.io.IOException;
import java.util.ArrayList;
@@ -134,10 +135,10 @@
} else {
Log.i("NFCWreatActivity", "isOpen===" + isOpen);
- return "-2";
+ return BaseCommon.CARD_TYPE_ERROR2;
}
} catch (IOException e) {
- return "-1";
+ return BaseCommon.CARD_TYPE_ERROR1;
} finally {
try {
mfc.close();
@@ -198,13 +199,13 @@
if (flag) {
callback.callBack(map);
} else {
- callback.error(MyCommon.ERROR);
+ callback.error(CardCommon.ERROR);
}
} catch (IOException e) {
- callback.error(MyCommon.ERROR_MOVE);
+ callback.error(CardCommon.ERROR_MOVE);
e.printStackTrace();
} catch (Exception e) {
- callback.error(MyCommon.ERROR);
+ callback.error(CardCommon.ERROR);
e.printStackTrace();
} finally {
try {
@@ -265,13 +266,13 @@
if (flag) {
callback.callBack(list);
} else {
- callback.error(MyCommon.ERROR);
+ callback.error(CardCommon.ERROR);
}
} catch (IOException e) {
- callback.error(MyCommon.ERROR_MOVE);
+ callback.error(CardCommon.ERROR_MOVE);
e.printStackTrace();
} catch (Exception e) {
- callback.error(MyCommon.ERROR);
+ callback.error(CardCommon.ERROR);
e.printStackTrace();
} finally {
@@ -303,12 +304,12 @@
mfc.connect();
int count = mfc.getSectorCount();
if (a < 0 || a > count - 1) {
- callback.error(MyCommon.ERROR);
+ callback.error(CardCommon.ERROR);
return;
}
int bCount = mfc.getBlockCountInSector(a);
if (b < 0 || b > bCount - 1) {
- callback.error(MyCommon.ERROR);
+ callback.error(CardCommon.ERROR);
return;
}
@@ -337,13 +338,13 @@
byte[] data = mfc.readBlock(bIndex + b);
callback.callBack(data);
} else {
- callback.error(MyCommon.ERROR);
+ callback.error(CardCommon.ERROR);
}
} catch (IOException e) {
- callback.error(MyCommon.ERROR_MOVE);
+ callback.error(CardCommon.ERROR_MOVE);
e.printStackTrace();
} catch (Exception e) {
- callback.error(MyCommon.ERROR);
+ callback.error(CardCommon.ERROR);
} finally {
try {
mfc.close();
--
Gitblit v1.8.0