From feb7add1979c830e0d940286242a7c489f2f8f96 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 27 九月 2024 09:23:34 +0800
Subject: [PATCH] 优化NFC模块架构，将一些方法抽调到父类中。
---
henanlibrary/src/main/java/com/dayu/henanlibrary/card/UserCardHN.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/card/UserCard.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/card/UserCardHN.java
similarity index 97%
rename from henanlibrary/src/main/java/com/dayu/henanlibrary/card/UserCard.java
rename to henanlibrary/src/main/java/com/dayu/henanlibrary/card/UserCardHN.java
index 9faa0db..b155849 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/card/UserCard.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/card/UserCardHN.java
@@ -1,5 +1,6 @@
package com.dayu.henanlibrary.card;
+import com.dayu.baselibrary.bean.BaseUserCardCard;
import com.dayu.baselibrary.tools.BcdUtil;
import com.dayu.baselibrary.tools.HexUtil;
import com.dayu.henanlibrary.utils.CardCommon;
@@ -14,7 +15,7 @@
* Date: 2023-11-07 9:37
* Description: 鐢ㄦ埛鍗＄粨鏋�
*/
-public class UserCard extends BaseCard implements Serializable {
+public class UserCardHN extends BaseUserCardCard implements Serializable {
public String cardType = CardCommon.USER_CARD_TYPE_1;//鍐欏崱鏍囧織 A1鍒峰崱寮�娉靛墠 A8鍒峰崱寮�娉靛悗 A2鍙犲姞鍏呭��
public int rechargeTimes;//鍏呭�兼鏁�
@@ -54,7 +55,8 @@
*
* @param data 璇诲崱鐨勬暟鎹�
*/
- public static UserCard getBean(List<byte[]> data) {
+ @Override
+ public UserCardHN getBean(List<byte[]> data) {
try {
if (data != null) {
@@ -62,7 +64,7 @@
byte[] one = data.get(1);
byte[] two = data.get(2);
if (zero != null && zero.length == 16) {
- UserCard userCard = new UserCard();
+ UserCardHN userCard = new UserCardHN();
userCard.cardType = HexUtil.byteToHex(zero[0]);
userCard.rechargeTimes = HexUtil.get16to10(HexUtil.byteToHex(zero[1]));
byte[] swipeNumberBytes = new byte[2];
--
Gitblit v1.8.0