From 88c82455871cd03e0a0b6f32591f9bee74a2dc34 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 05 三月 2024 14:52:22 +0800
Subject: [PATCH] 1.修改卡标识的bug 2.优化卡结构的代码
---
app/src/main/java/com/dayu/recharge/card/RegisteredCard.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/card/RegisteredCard.java b/app/src/main/java/com/dayu/recharge/card/RegisteredCard.java
index e76c846..2264e99 100644
--- a/app/src/main/java/com/dayu/recharge/card/RegisteredCard.java
+++ b/app/src/main/java/com/dayu/recharge/card/RegisteredCard.java
@@ -1,6 +1,8 @@
package com.dayu.recharge.card;
+import com.dayu.recharge.dao.AppDatabase;
import com.dayu.recharge.tools.HexUtil;
+import com.dayu.recharge.utils.MyCommon;
import java.io.Serializable;
@@ -10,23 +12,25 @@
* Date: 2023-11-08 11:36
* Description:閲嶆柊娉ㄥ唽璁惧鍗★細鐢ㄤ簬鍐欑敤鎴锋敞鍐屽彿
*/
-public class RegisteredCard implements Serializable {
- public String cardType = "BA";//鍗＄被鍨�
- public String cardData = "A0B1C289";//鏍囪瘑鐮�
+public class RegisteredCard extends BaseCard implements Serializable {
+ public String cardType = MyCommon.REGISTERED_CARD_TYPE;//鍗＄被鍨�
- public byte[] toByte() {
+ public String getCardData() {
+ return cardData;
+ }
+
+ public byte[] toByte(AppDatabase appDatabase) {
+ setCardData(appDatabase, cardType);
Zero zero = new Zero();
return zero.toByte();
}
- public class Zero extends BaseCard {
+ public class Zero {
public byte[] toByte() {
byte[] data = new byte[16];
data[0] = HexUtil.hexToByte(cardType);
byte[] cardDatas = HexUtil.hexToByteArray(cardData);
- for (int i = 0; i < 4; i++) {
- data[i + 1] = cardDatas[i];
- }
+ System.arraycopy(cardDatas, 0, data, 1, cardDatas.length);
data[15] = getByteSum(data);
return data;
}
--
Gitblit v1.8.0