From 08bfe3072377b53c60e0952f00c26bce2e5b4bc0 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 18 六月 2025 17:05:55 +0800
Subject: [PATCH] feat(card): 添加卡片返还功能- 新增 CardReturnActivity 用于执行卡片返还操作 - 在 BSCardFragment 中添加返还按钮,跳转到 CardReturnActivity - 在 CardOperationType 中添加 ReturnCard 类型 - 修改 CardReadActivity,优化卡片信息显示逻辑 - 更新 CardWriteSuccessActivity,支持返还成功提示 - 新增 ic_morny_back 图标用于返还操作

---
 qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/BlackCard.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/BlackCard.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/BlackCard.java
index c39eeb7..282a7d3 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/BlackCard.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/BlackCard.java
@@ -1,8 +1,8 @@
 package com.dayu.qihealonelibrary.card;
 
 import com.dayu.baselibrary.tools.HexUtil;
-import com.dayu.qihealonelibrary.dao.AppDatabase;
-import com.dayu.qihealonelibrary.utils.MyCommon;
+import com.dayu.qihealonelibrary.dao.QHAloneAppDatabase;
+import com.dayu.qihealonelibrary.utils.CardCommon;
 
 import java.io.Serializable;
 import java.util.List;
@@ -15,7 +15,7 @@
  */
 public class BlackCard extends BaseCard implements Serializable {
 
-    public String cardType = MyCommon.BLACK;
+    public String cardType = CardCommon.BLACK;
 
     public String blackCard;//榛戞埛鍗″彿
 
@@ -27,8 +27,8 @@
         this.blackCard = blackCard;
     }
 
-    public byte[] toByte(AppDatabase appDatabase) {
-        setCardData(appDatabase, cardType);
+    public byte[] toByte(QHAloneAppDatabase QHAloneAppDatabase) {
+        setCardData(QHAloneAppDatabase, cardType);
         Zero zero = new Zero();
         return zero.toByte();
     }

--
Gitblit v1.8.0