From 44e05fc867c3f028cf110f7b2fefb417d51646b2 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 14 三月 2024 12:01:13 +0800
Subject: [PATCH] 添加密码校验 修复用户卡bug
---
app/src/main/java/com/dayu/recharge/card/ManageCard.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/card/ManageCard.java b/app/src/main/java/com/dayu/recharge/card/ManageCard.java
index 4bea602..00db4ec 100644
--- a/app/src/main/java/com/dayu/recharge/card/ManageCard.java
+++ b/app/src/main/java/com/dayu/recharge/card/ManageCard.java
@@ -1,5 +1,6 @@
package com.dayu.recharge.card;
+import com.dayu.recharge.dao.AppDatabase;
import com.dayu.recharge.tools.HexUtil;
import com.dayu.recharge.utils.MyCommon;
@@ -11,27 +12,27 @@
* 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 = "3668F7A30119";//鏍囪瘑鐮�
+// public String cardData = "3668F7A30119";//鏍囪瘑鐮�
public String getCardData() {
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[] cardDatas = HexUtil.hexToByteArray(cardData);
- for (int i = 0; i < 6; i++) {
- data[i + 1] = cardDatas[i];
- }
+ System.arraycopy(cardDatas, 0, data, 1, cardDatas.length);
data[15] = getByteSum(data);
return data;
}
--
Gitblit v1.8.0