添加齐河管理卡相关逻辑 修复bug

zuoxiao

2024-07-13 d08a5a6d062f1568aaeb14d2d72357826291ef97

 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();