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/ManageCard.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 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 2f8ed23..241150a 100644
--- a/app/src/main/java/com/dayu/recharge/card/ManageCard.java
+++ b/app/src/main/java/com/dayu/recharge/card/ManageCard.java
@@ -1,8 +1,7 @@
package com.dayu.recharge.card;
-import com.dayu.recharge.tools.BcdUtil;
import com.dayu.recharge.tools.HexUtil;
-import com.dayu.recharge.utils.MornyUtil;
+import com.dayu.recharge.utils.MyCommon;
import java.io.Serializable;
@@ -13,9 +12,25 @@
* Description: 绠＄悊鍗� 绗�1鎵囧尯 0鍧�
*/
public class ManageCard implements Serializable {
- public String cardType = "B2";//鍗＄被鍨�
- public String cardData = "3668F7A30119";//鏍囪瘑鐮�
+ public String cardType = MyCommon.MANAGE_CRAD;//鍗＄被鍨�
+ public String cardData = "A0B1C289";//鏍囪瘑鐮�
+
+ /**
+ * M1鍗＄殑0鎵囧尯0鍧楅�氬父鐢ㄤ簬瀛樺偍涓�浜涘熀鏈殑鍗＄墖淇℃伅
+ * 绗�0瀛楄妭锛氬崱鐗囩被鍨嬶紙M1鍗′负0x08锛�
+ * 绗�1瀛楄妭锛氬崱鐗囧湴鍧�锛堥�氬父涓�0x00锛�
+ * 绗�2-5瀛楄妭锛氬崱鐗囧簭鍒楀彿锛�4瀛楄妭锛�
+ * 绗�6-8瀛楄妭锛氬崱鐗囧埗閫犲晢浠ｇ爜锛�3瀛楄妭锛�
+ * 绗�9瀛楄妭锛氬崱鐗囩増鏈�
+ * 绗�10-15瀛楄妭锛氶鐣欏尯鍩�
+ */
+ public byte[] userCard; //鐢ㄦ埛鍗″彿
+
+
+ public String getCardData() {
+ return cardData;
+ }
public byte[] toZeroByte() {
Zero zero = new Zero();
@@ -26,10 +41,16 @@
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];
+
+ byte[] cardDataByte = HexUtil.hexToByteArray(cardData);
+ if (cardDataByte != null) {
+ System.arraycopy(cardDataByte, 0, data, 1, cardDataByte.length);
}
+
+ if (userCard!=null){
+ System.arraycopy(userCard, 0, data, 5, userCard.length);
+ }
+
data[15] = getByteSum(data);
return data;
}
--
Gitblit v1.8.0