From 1cbb505922e010cace51020773a2dc1529713322 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 06 三月 2024 16:12:58 +0800
Subject: [PATCH] 1.修改包名
---
app/src/main/java/com/dayu/rechargeqh/card/RegisteredCard.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/card/RegisteredCard.java b/app/src/main/java/com/dayu/rechargeqh/card/RegisteredCard.java
similarity index 60%
rename from app/src/main/java/com/dayu/recharge/card/RegisteredCard.java
rename to app/src/main/java/com/dayu/rechargeqh/card/RegisteredCard.java
index de5c242..354055a 100644
--- a/app/src/main/java/com/dayu/recharge/card/RegisteredCard.java
+++ b/app/src/main/java/com/dayu/rechargeqh/card/RegisteredCard.java
@@ -1,7 +1,8 @@
-package com.dayu.recharge.card;
+package com.dayu.rechargeqh.card;
-import com.dayu.recharge.tools.HexUtil;
-import com.dayu.recharge.utils.MyCommon;
+import com.dayu.rechargeqh.dao.AppDatabase;
+import com.dayu.rechargeqh.tools.HexUtil;
+import com.dayu.rechargeqh.utils.MyCommon;
import java.io.Serializable;
@@ -11,27 +12,25 @@
* Date: 2023-11-08 11:36
* Description:閲嶆柊娉ㄥ唽璁惧鍗★細鐢ㄤ簬鍐欑敤鎴锋敞鍐屽彿
*/
-public class RegisteredCard implements Serializable {
+public class RegisteredCard extends BaseCard implements Serializable {
public String cardType = MyCommon.REGISTERED_CARD_TYPE;//鍗＄被鍨�
- public String cardData = "A0B1C289";//鏍囪瘑鐮�
public String getCardData() {
return cardData;
}
- public byte[] toByte() {
+ 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