From 88c82455871cd03e0a0b6f32591f9bee74a2dc34 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 05 三月 2024 14:52:22 +0800
Subject: [PATCH] 1.修改卡标识的bug 2.优化卡结构的代码

---
 app/src/main/java/com/dayu/recharge/card/BaseCard.java |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/app/src/main/java/com/dayu/recharge/card/BaseCard.java b/app/src/main/java/com/dayu/recharge/card/BaseCard.java
index c7b4357..bf4b1e2 100644
--- a/app/src/main/java/com/dayu/recharge/card/BaseCard.java
+++ b/app/src/main/java/com/dayu/recharge/card/BaseCard.java
@@ -1,6 +1,10 @@
 package com.dayu.recharge.card;
 
+import com.dayu.recharge.dao.AppDatabase;
+import com.dayu.recharge.dbBean.CardData;
 import com.dayu.recharge.tools.HexUtil;
+import com.dayu.recharge.utils.MyCommon;
+import com.tencent.bugly.crashreport.CrashReport;
 
 import java.io.Serializable;
 
@@ -11,11 +15,26 @@
  * Description:鎵�鏈夊崱缁撴瀯鐨勭埗绫�
  */
 public class BaseCard implements Serializable {
+    public String cardData;//鏍囪瘑鐮�
+
+    public void setCardData(AppDatabase baseDao, String cardType) {
+        try {
+            CardData cardDataBean = baseDao.cardDataDao().findFirst(cardType);
+            if (cardDataBean != null) {
+                cardData = cardDataBean.getCardIdentifying();
+            } else {
+                cardData=MyCommon.getDefaultCardData(cardType);
+            }
+        } catch (Exception e) {
+            CrashReport.postCatchedException(e);
+        }
+    }
+
 
     /**
      * 鍓�15涓瓧鑺傜畻鏈疮鍔犲拰 涓嶅惈杩涗綅
      *
-     * @param data
+     * @param data 婧愭暟鎹�
      * @return 16杩涘埗
      */
     public byte getByteSum(byte[] data) {

--
Gitblit v1.8.0