From f5180b600511d1871635bd364beb5bdd15f6ae88 Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期三, 26 三月 2025 18:05:07 +0800
Subject: [PATCH] feat(nfc): 优化 NFC写卡功能并添加新方法- 在 BaseNfcWriteHelper 中添加了新的 writeData 方法,增加了 isConnect 参数 - 优化了 NativeNfcWriteHelper 中的 writeData 实现,支持选择性连接 NFC - 更新了 NfcWriteAdapter,支持新的 writeData 方法- 修改了 NfcWreatHelper 中的 writeData 方法,使用新的接口 - 优化了 NfcWreatActivity 中的写卡逻辑

---
 generallibrary/src/main/java/com/dayu/general/dao/BaseDaoSingleton.kt |   28 ++++++++++++----------------
 1 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/generallibrary/src/main/java/com/dayu/general/dao/BaseDaoSingleton.kt b/generallibrary/src/main/java/com/dayu/general/dao/BaseDaoSingleton.kt
index 7edd95d..1bcc754 100644
--- a/generallibrary/src/main/java/com/dayu/general/dao/BaseDaoSingleton.kt
+++ b/generallibrary/src/main/java/com/dayu/general/dao/BaseDaoSingleton.kt
@@ -9,28 +9,24 @@
 class BaseDaoSingleton {
 
     companion object {
+        var baseDao: AppDataBase? = null
         @JvmField
         val SqlitePath: String =
             Environment.getExternalStorageDirectory().absolutePath + File.separator + ".dayu" + File.separator + "data" + File.separator
-    }
+        fun getInstance(context: Context): AppDataBase {
+            if (baseDao == null) {
+                baseDao = Room.databaseBuilder<AppDataBase>(
+                    context,
+                    AppDataBase::class.java,
+                    SqlitePath + "ConfigurationData_generalV1"
+                ).allowMainThreadQueries().build()
+            }
+            return baseDao as AppDataBase
+        }
 
-    var baseDao: AppDataBase? = null
+    }
 
     var AsynchBaseDao: AppDataBase? = null
-
-
-
-    //MyFileUtil.SqlitePath +
-    fun getInstance(context: Context?): AppDataBase? {
-        if (baseDao == null) {
-            baseDao = Room.databaseBuilder<AppDataBase>(
-                context!!,
-                AppDataBase::class.java,
-                SqlitePath + "ConfigurationData_generalV1"
-            ).allowMainThreadQueries().build()
-        }
-        return baseDao
-    }
 
     fun getAsynchInstance(context: Context?): AppDataBase? {
         if (AsynchBaseDao == null) {

--
Gitblit v1.8.0