From dd2562d8dc2b01bcdfca3152f82f09efbbd09259 Mon Sep 17 00:00:00 2001
From: zuoxiao <lf_zuo@163.com>
Date: 星期三, 25 六月 2025 19:49:48 +0800
Subject: [PATCH] fix(generallibrary): 优化卡片处理和支付方式获取逻辑- 修复地区卡处理逻辑，增加对"00"类型卡的特殊处理 - 优化用户卡数据解析和显示逻辑，提高容错性 - 改进支付方式获取方法，增加错误处理和日志记录 -调整充值接口调用参数，确保正确传递当前余额等信息- 修复 AreaCard 中 areaNumber 类型，改为字符串处理
---
baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/BaseNfcReadHelper.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/BaseNfcReadHelper.java b/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/BaseNfcReadHelper.java
index 933ff26..681abb9 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/BaseNfcReadHelper.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/BaseNfcReadHelper.java
@@ -1,7 +1,11 @@
package com.dayu.baselibrary.tools.nfc;
+import android.content.Intent;
+
import com.dayu.baselibrary.bean.BaseManagerToUserCard;
import com.dayu.baselibrary.bean.BaseUserCardCard;
+
+import org.jetbrains.annotations.NotNull;
import java.util.List;
import java.util.Map;
@@ -14,6 +18,8 @@
*/
public abstract class BaseNfcReadHelper extends BaseNFCHelper {
+
+ public abstract void setIntent(Intent intent);
public abstract String getCradType();
@@ -45,7 +51,18 @@
*
* @return
*/
- public abstract String getCradTypeAndCardNumber();
+ public String getCradTypeAndCardNumber(){
+ return getCradTypeAndCardNumber(1,0,0);
+ };
+
+ /**
+ * 鑾峰彇鍗＄墖绫诲瀷鍜屽崱鍙�
+ *
+ * @return
+ */
+ public String getCradTypeAndCardNumber(int sectorIndex,int blockIndex,int cardTypeIndex){
+ return null;
+ };
/**
* 璇诲彇NFC鍗＄殑鐗瑰畾鎵囧尯淇℃伅
@@ -65,18 +82,26 @@
public abstract List<byte[]> getOnesectorData();
+ public BaseUserCardCard getUserCardData(BaseUserCardCard userCardCard){
+ return getUserCardData(1,userCardCard);
+ };
+
/**
* 鍚屾鑾峰彇鐢ㄦ埛鍗′俊鎭�
*
* @return
*/
- public abstract BaseUserCardCard getUserCardData(BaseUserCardCard userCardCard);
+ public BaseUserCardCard getUserCardData(int sectorIndex,BaseUserCardCard userCardCard){
+ return null;
+ }
public BaseManagerToUserCard getManagerToUserCardData(BaseManagerToUserCard baseManagerToUserCard) {
return null;
}
+
+
/**
* 杩斿洖鐩戝惉绫�
*/
--
Gitblit v1.8.0