From 22a6b851897ef5ef25f64b740159e7106cfd6433 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 14 十一月 2023 17:21:17 +0800
Subject: [PATCH] 配置水泵功率卡 配置设备注册信息卡 测试卡 设置域名卡 删除全部用户卡 重新注册设备卡 等相关制作卡片代码

---
 app/src/main/java/com/dayu/recharge/card/ConfigurationPowerCard.java |   33 ++++++++++++++++++++++++++-------
 1 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/dayu/recharge/card/ConfigurationPowerCard.java b/app/src/main/java/com/dayu/recharge/card/ConfigurationPowerCard.java
index f378897..0275c80 100644
--- a/app/src/main/java/com/dayu/recharge/card/ConfigurationPowerCard.java
+++ b/app/src/main/java/com/dayu/recharge/card/ConfigurationPowerCard.java
@@ -2,6 +2,8 @@
 
 import com.dayu.recharge.tools.HexUtil;
 
+import java.io.Serializable;
+
 /**
  * Copyright (C), 2023,
  * Author: zuo
@@ -11,7 +13,7 @@
  * 涓烘柟渚跨幇鍦烘洿鎹㈣澶囨椂閲嶆柊娉ㄥ唽鐨勯棶棰橈紝閰嶇疆璁惧淇℃伅鍗★紝棣栧厛鍒峰崱锛屾妸鍘熻澶囩殑娉ㄥ唽鍙峰拰ID鍙疯鍒板崱鍐咃紝
  * 鍚屾椂鍗$姸鎬佸垯00淇敼涓篎F锛屽啀鏂拌澶囦笂鍒锋鍗℃椂锛屾敞鍐屽彿鍜孖D鍙疯嚜鍔ㄥ啓鍒版帶鍒跺櫒鍐咃紝鍙互鐩存帴鍒峰崱浣跨敤
  */
-public class ConfigurationPowerCard {
+public class ConfigurationPowerCard implements Serializable {
 
 
     public String cardType = "BD";//鍗$被鍨�
@@ -19,20 +21,37 @@
 
     public String power;//鍔熺巼
 
+    public String getPower() {
+        return power;
+    }
+
+    public void setPower(String power) {
+        this.power = power;
+    }
+
+    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];
             }
-            float floatPower = Float.parseFloat(power);
-            int intPower = (int) Math.ceil(floatPower); // 灏嗘诞鐐规暟鍚戜笂鍙栨暣骞惰浆鎹负鏁存暟
-            String hexPower = HexUtil.get10to16(intPower);
-            byte bytePower = HexUtil.hexToByte(hexPower);
-            data[5] = bytePower;
+            if (power != null) {
+                float floatPower = Float.parseFloat(power);
+                int intPower = (int) Math.ceil(floatPower); // 灏嗘诞鐐规暟鍚戜笂鍙栨暣骞惰浆鎹负鏁存暟
+                String hexPower = HexUtil.get10to16(intPower);
+                byte bytePower = HexUtil.hexToByte(hexPower);
+                data[5] = bytePower;
+            }
+
             data[15] = getByteSum(data);
+            return data;
         }
 
     }

--
Gitblit v1.8.0