From a9c1231be4e3c1c5bd5e9fc61489d55363090407 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 04 三月 2024 15:26:22 +0800
Subject: [PATCH] 齐河项目相关修改
---
app/src/main/java/com/dayu/recharge/card/PassWordCard.java | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/card/PassWordCard.java b/app/src/main/java/com/dayu/recharge/card/PassWordCard.java
index 775eebe..40d038b 100644
--- a/app/src/main/java/com/dayu/recharge/card/PassWordCard.java
+++ b/app/src/main/java/com/dayu/recharge/card/PassWordCard.java
@@ -1,6 +1,9 @@
package com.dayu.recharge.card;
import com.dayu.recharge.tools.HexUtil;
+import com.dayu.recharge.utils.MyCommon;
+
+import java.util.List;
/**
* Copyright (C), 2023,
@@ -9,18 +12,51 @@
* Description:瀵嗙爜鍗�
*/
public class PassWordCard {
- public String cardType = "B3";//鍗＄被鍨�
+ public String cardType = MyCommon.PASS_WORD_CRAD_TYPE;//鍗＄被鍨�
public String cardData = "A0B1C289";//鏍囪瘑鐮�
+ public String passWord;//鍏綅鐨勫瘑鐮�
+
+
+
+ public static PassWordCard getBean(List<byte[]> data){
+
+ if (data!=null){
+ PassWordCard passWordCard=new PassWordCard();
+
+ byte[] zero=data.get(0);
+ byte[] passWordByte=new byte[6];
+ System.arraycopy(zero, 5, passWordByte, 0, passWordByte.length);
+ passWordCard.passWord = HexUtil.bytesToHex(passWordByte);
+ return passWordCard;
+ }
+ return null;
+
+
+ }
+
+
+ public byte[] toByte() {
+ Zero zero = new Zero();
+ return zero.toByte();
+ }
+
public class Zero extends BaseCard {
- public void toByte() {
+ 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];
+ if (cardDatas != null) {
+ System.arraycopy(cardDatas, 0, data, 1, cardDatas.length);
}
+
+ byte[] passWordBytes = HexUtil.hexToByteArray(passWord);
+ if (passWordBytes != null) {
+ System.arraycopy(passWordBytes, 0, data, 5, passWordBytes.length);
+ }
+
data[15] = getByteSum(data);
+ return data;
}
}
--
Gitblit v1.8.0