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/ConfigureDeviceRegistrationCrad.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/card/ConfigureDeviceRegistrationCrad.java b/app/src/main/java/com/dayu/rechargeqh/card/ConfigureDeviceRegistrationCrad.java
similarity index 68%
rename from app/src/main/java/com/dayu/recharge/card/ConfigureDeviceRegistrationCrad.java
rename to app/src/main/java/com/dayu/rechargeqh/card/ConfigureDeviceRegistrationCrad.java
index 796d029..a8fea71 100644
--- a/app/src/main/java/com/dayu/recharge/card/ConfigureDeviceRegistrationCrad.java
+++ b/app/src/main/java/com/dayu/rechargeqh/card/ConfigureDeviceRegistrationCrad.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;
@@ -14,7 +15,7 @@
* <p>
* 涓烘柟渚跨幇鍦烘洿鎹㈣澶囨椂閲嶆柊娉ㄥ唽鐨勯棶棰橈紝閰嶇疆璁惧淇℃伅鍗★紝棣栧厛鍒峰崱锛屾妸鍘熻澶囩殑娉ㄥ唽鍙峰拰ID鍙疯鍒板崱鍐咃紝鍚屾椂鍗＄姸鎬佸垯00淇敼涓篎F锛屽啀鏂拌澶囦笂鍒锋鍗℃椂锛屾敞鍐屽彿鍜孖D鍙疯嚜鍔ㄥ啓鍒版帶鍒跺櫒鍐咃紝鍙互鐩存帴鍒峰崱浣跨敤
*/
-public class ConfigureDeviceRegistrationCrad implements Serializable {
+public class ConfigureDeviceRegistrationCrad extends BaseCard implements Serializable {
public String cardType = MyCommon.CONFIGURATION_CARD_TYPE;//鍗＄被鍨�
public String cardData = "A0B1C289";//鏍囪瘑鐮�
@@ -22,20 +23,18 @@
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