From d09bdcac6830afaad6e277fb558c16d2aa6187a7 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 14 十二月 2023 11:13:21 +0800
Subject: [PATCH] 卡标识码列表功能相关,可分辨设置不同类型卡标识码

---
 app/src/main/java/com/dayu/recharge/card/ConfigurationPowerCard.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 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 0275c80..c727b4c 100644
--- a/app/src/main/java/com/dayu/recharge/card/ConfigurationPowerCard.java
+++ b/app/src/main/java/com/dayu/recharge/card/ConfigurationPowerCard.java
@@ -1,6 +1,8 @@
 package com.dayu.recharge.card;
 
 import com.dayu.recharge.tools.HexUtil;
+import com.dayu.recharge.utils.MyCommon;
+import com.tencent.bugly.crashreport.CrashReport;
 
 import java.io.Serializable;
 
@@ -8,7 +10,7 @@
  * Copyright (C), 2023,
  * Author: zuo
  * Date: 2023-11-08 13:26
- * Description: 閰嶇疆璁惧娉ㄥ唽淇℃伅鍗★細
+ * Description: 閰嶇疆姘存车鍔熺巼鍗★細
  * <p>
  * 涓烘柟渚跨幇鍦烘洿鎹㈣澶囨椂閲嶆柊娉ㄥ唽鐨勯棶棰橈紝閰嶇疆璁惧淇℃伅鍗★紝棣栧厛鍒峰崱锛屾妸鍘熻澶囩殑娉ㄥ唽鍙峰拰ID鍙疯鍒板崱鍐咃紝
  * 鍚屾椂鍗$姸鎬佸垯00淇敼涓篎F锛屽啀鏂拌澶囦笂鍒锋鍗℃椂锛屾敞鍐屽彿鍜孖D鍙疯嚜鍔ㄥ啓鍒版帶鍒跺櫒鍐咃紝鍙互鐩存帴鍒峰崱浣跨敤
@@ -16,8 +18,12 @@
 public class ConfigurationPowerCard implements Serializable {
 
 
-    public String cardType = "BD";//鍗$被鍨�
+    public String cardType = MyCommon.CONFIGURATION_POWER_CARD_TYPE;//鍗$被鍨�
     public String cardData = "A0B1C289";//鏍囪瘑鐮�
+
+    public String getCardData() {
+        return cardData;
+    }
 
     public String power;//鍔熺巼
 
@@ -29,6 +35,20 @@
         this.power = power;
     }
 
+
+    public static ConfigurationPowerCard toBean(byte[] data) {
+        try {
+            ConfigurationPowerCard powerCard = new ConfigurationPowerCard();
+            int intPower = HexUtil.get16to10(HexUtil.byteToHex(data[5]));
+            powerCard.setPower(String.valueOf(intPower));
+            return powerCard;
+        } catch (Exception e) {
+            e.printStackTrace();
+            CrashReport.postCatchedException(e);
+            return null;
+        }
+    }
+
     public byte[] toByte() {
         Zero zero = new Zero();
         return zero.toByte();

--
Gitblit v1.8.0