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/dao/BaseDaoSingleton.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dao/BaseDaoSingleton.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dao/BaseDaoSingleton.java
index aa222d1..20cbfbf 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dao/BaseDaoSingleton.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/dao/BaseDaoSingleton.java
@@ -14,30 +14,30 @@
  * Description: 鍒涘缓鏁版嵁搴撳疄渚�
  */
 public class BaseDaoSingleton {
-    public static AppDatabase baseDao;
-    public static AppDatabase AsynchBaseDao;
-    public static String SqlitePath = Environment.getExternalStorageDirectory().getAbsolutePath() + File.separator + ".dayu" + File.separator + "data_qh" + File.separator;
+    public static QHAloneAppDatabase baseDao;
+    public static QHAloneAppDatabase AsynchBaseDao;
+    public static String SqlitePath = Environment.getExternalStorageDirectory().getAbsolutePath() + File.separator + ".dayu" + File.separator + "data" + File.separator;
 
     //MyFileUtil.SqlitePath +
-    public static AppDatabase getInstance(Context context) {
+    public static QHAloneAppDatabase getInstance(Context context) {
         if (baseDao == null) {
             baseDao = Room.databaseBuilder(
                     context,
-                    AppDatabase.class,
-                    SqlitePath + "ConfigurationData"
-            ).allowMainThreadQueries().addMigrations(AppDatabase.MIGRATION_3_4).build();
+                    QHAloneAppDatabase.class,
+                    SqlitePath + "ConfigurationData_qiheAlone"
+            ).allowMainThreadQueries().addMigrations(QHAloneAppDatabase.MIGRATION_3_4).build();
         }
         return baseDao;
     }
 
-    public static AppDatabase getAsynchInstance(Context context) {
+    public static QHAloneAppDatabase getAsynchInstance(Context context) {
 
         if (AsynchBaseDao == null) {
             AsynchBaseDao = Room.databaseBuilder(
                     context,
-                    AppDatabase.class,
-                    SqlitePath + "ConfigurationData"
-            ).addMigrations(AppDatabase.MIGRATION_3_4).build();
+                    QHAloneAppDatabase.class,
+                    SqlitePath + "ConfigurationData_qiheAlone"
+            ).addMigrations(QHAloneAppDatabase.MIGRATION_3_4).build();
         }
         return AsynchBaseDao;
 

--
Gitblit v1.8.0