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 |   13 +++----------
 1 files changed, 3 insertions(+), 10 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 1b4f9f8..1bcc754 100644
--- a/generallibrary/src/main/java/com/dayu/general/dao/BaseDaoSingleton.kt
+++ b/generallibrary/src/main/java/com/dayu/general/dao/BaseDaoSingleton.kt
@@ -13,27 +13,20 @@
         @JvmField
         val SqlitePath: String =
             Environment.getExternalStorageDirectory().absolutePath + File.separator + ".dayu" + File.separator + "data" + File.separator
-        @JvmStatic
-        fun getInstance(context: Context?): AppDataBase? {
+        fun getInstance(context: Context): AppDataBase {
             if (baseDao == null) {
                 baseDao = Room.databaseBuilder<AppDataBase>(
-                    context!!,
+                    context,
                     AppDataBase::class.java,
                     SqlitePath + "ConfigurationData_generalV1"
                 ).allowMainThreadQueries().build()
             }
-            return baseDao
+            return baseDao as AppDataBase
         }
 
     }
 
-
-
     var AsynchBaseDao: AppDataBase? = null
-
-
-
-
 
     fun getAsynchInstance(context: Context?): AppDataBase? {
         if (AsynchBaseDao == null) {

--
Gitblit v1.8.0