feat(generallibrary): 优化充值功能并添加水价获取- 在 activity_recharge_detail.xml 中移除了不必要...

zuoxiao

3 天以前 a8751388c9a86ae95714a15279994d8aa426a26d

 baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NativeNfcReadHelper.java

@@ -7,6 +7,8 @@
import android.nfc.tech.MifareClassic;
import android.util.Log;

import androidx.annotation.NonNull;

import com.dayu.baselibrary.bean.BaseManagerToUserCard;
import com.dayu.baselibrary.bean.BaseUserCardCard;
import com.dayu.baselibrary.tools.HexUtil;
@@ -29,8 +31,6 @@
    private Tag tag;
    //    private NFCCallback callback;
    private static NativeNfcReadHelper helper;




    @Override
@@ -435,9 +435,6 @@
    }





    public String getCardNumberNoClose() {
        if (tag == null) {
            return "";
@@ -483,13 +480,19 @@
        return "";
    }

    @Override
    public String getCradTypeAndCardNumber() {
        return getCradTypeAndCardNumber(1);
    }


    /**
     * 获取卡片类型和卡号
     *
     * @return
     */
    @Override
    public String getCradTypeAndCardNumber() {

    public String getCradTypeAndCardNumber(int sectorIndex) {

        MifareClassic mfc = MifareClassic.get(tag);
        if (null != mfc) {
@@ -498,10 +501,18 @@
                StringBuilder strData = new StringBuilder();
                //获取当前卡号
                boolean isOpen = false;
                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;
                    } else if (mfc.authenticateSectorWithKeyA(0, defauleKey)) {
                        isOpen = true;
                    }
                }
                if (isOpen) {
@@ -517,15 +528,23 @@
                    }
                }
                //获取卡片类型
                if (!listKeyA.isEmpty()) {
                for (int i = 0; i < listKeyA.size(); i++) {
                    if (mfc.authenticateSectorWithKeyA(1, listKeyA.get(i))) {
                        if (mfc.authenticateSectorWithKeyA(sectorIndex, listKeyA.get(i))) {
                        isOpen = true;
                        break;
                    }
                }
                } else if (!listA_PS.isEmpty()) {
                    if (mfc.authenticateSectorWithKeyA(sectorIndex, listA_PS.get(sectorIndex))) {
                        isOpen = true;
                    } else if (mfc.authenticateSectorWithKeyA(sectorIndex, defauleKey)) {
                        isOpen = true;
                    }
                }
                if (isOpen) {
                    int bIndex = mfc.sectorToBlock(1);
                    byte[] data = mfc.readBlock(bIndex + 0);
                    int bIndex = mfc.sectorToBlock(sectorIndex);
                    byte[] data = mfc.readBlock(bIndex + sectorIndex);
                    if (data != null && data.length > 0) {
                        String hex = HexUtil.byteToHex(data[0]);
                        strData.append(hex);
@@ -676,4 +695,6 @@
    }




}