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/RegionCard.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/dayu/recharge/card/RegionCard.java b/app/src/main/java/com/dayu/rechargeqh/card/RegionCard.java
similarity index 84%
rename from app/src/main/java/com/dayu/recharge/card/RegionCard.java
rename to app/src/main/java/com/dayu/rechargeqh/card/RegionCard.java
index 9adf9b7..a09152c 100644
--- a/app/src/main/java/com/dayu/recharge/card/RegionCard.java
+++ b/app/src/main/java/com/dayu/rechargeqh/card/RegionCard.java
@@ -1,7 +1,7 @@
-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.tools.HexUtil;
+import com.dayu.rechargeqh.utils.MyCommon;
 
 import java.io.Serializable;
 import java.util.List;
@@ -12,7 +12,7 @@
  * Time: 16:29
  * 澶囨敞锛氬尯鍩熻〃鍙峰崱
  */
-public class RegionCard implements Serializable {
+public class RegionCard extends BaseCard implements Serializable {
 
     public String cardType = MyCommon.REGION;//鍗″懡浠�
 
@@ -21,6 +21,13 @@
     public short controllerCodel;// 鎺у埗鍣ㄧ紪鍙�(浣庡墠楂樺悗) 鏈尯鍩熷唴鎺у埗鍣ㄧ紪鍙�
 
 
+    public short getRegion() {
+        return region;
+    }
+
+    public short getControllerCodel() {
+        return controllerCodel;
+    }
 
     public byte[] toByte() {
         RegionCard.Zero zero = new RegionCard.Zero();
@@ -51,7 +58,7 @@
     /**
      * 绗�1鎵囧尯0鍧� 瀛樺偍鐨勬暟鎹�
      */
-    public class Zero extends BaseCard {
+    public class Zero  {
         public byte[] toByte() {
             byte[] data = new byte[16];
             data[0] = HexUtil.hexToByte(cardType);

--
Gitblit v1.8.0