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/ManageCard.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/card/ManageCard.java b/app/src/main/java/com/dayu/rechargeqh/card/ManageCard.java
similarity index 68%
rename from app/src/main/java/com/dayu/recharge/card/ManageCard.java
rename to app/src/main/java/com/dayu/rechargeqh/card/ManageCard.java
index 241150a..a3a095a 100644
--- a/app/src/main/java/com/dayu/recharge/card/ManageCard.java
+++ b/app/src/main/java/com/dayu/rechargeqh/card/ManageCard.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,9 +12,9 @@
* Date: 2023-11-08 10:19
* Description: 绠＄悊鍗� 绗�1鎵囧尯 0鍧�
*/
-public class ManageCard implements Serializable {
+public class ManageCard extends BaseCard implements Serializable {
public String cardType = MyCommon.MANAGE_CRAD;//鍗＄被鍨�
- public String cardData = "A0B1C289";//鏍囪瘑鐮�
+// public String cardData = "A0B1C289";//鏍囪瘑鐮�
/**
@@ -32,22 +33,21 @@
return cardData;
}
- public byte[] toZeroByte() {
+ public byte[] toZeroByte(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[] cardDataByte = HexUtil.hexToByteArray(cardData);
- if (cardDataByte != null) {
- System.arraycopy(cardDataByte, 0, data, 1, cardDataByte.length);
- }
+ System.arraycopy(cardDataByte, 0, data, 1, cardDataByte.length);
- if (userCard!=null){
+ if (userCard != null) {
System.arraycopy(userCard, 0, data, 5, userCard.length);
}
--
Gitblit v1.8.0