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/BaseCard.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/BaseCard.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/BaseCard.java
index c26bc5b..376f2ac 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/BaseCard.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/BaseCard.java
@@ -1,9 +1,9 @@
package com.dayu.qihealonelibrary.card;
import com.dayu.baselibrary.tools.HexUtil;
-import com.dayu.qihealonelibrary.dao.AppDatabase;
+import com.dayu.qihealonelibrary.dao.QHAloneAppDatabase;
import com.dayu.qihealonelibrary.dbBean.CardData;
-import com.dayu.qihealonelibrary.utils.MyCommon;
+import com.dayu.qihealonelibrary.utils.CardCommon;
import com.tencent.bugly.crashreport.CrashReport;
import java.io.Serializable;
@@ -17,13 +17,13 @@
public class BaseCard implements Serializable {
public String cardData;//鏍囪瘑鐮�
- public void setCardData(AppDatabase baseDao, String cardType) {
+ public void setCardData(QHAloneAppDatabase baseDao, String cardType) {
try {
CardData cardDataBean = baseDao.cardDataDao().findFirst(cardType);
if (cardDataBean != null) {
cardData = cardDataBean.getCardIdentifying();
} else {
- cardData=MyCommon.getDefaultCardData(cardType);
+ cardData= CardCommon.getDefaultCardData(cardType);
}
} catch (Exception e) {
CrashReport.postCatchedException(e);
--
Gitblit v1.8.0