From 15a3fc02c120ff630a9721a2f48a82f76675213f Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期一, 07 四月 2025 09:04:20 +0800
Subject: [PATCH] feat(generallibrary): 添加新卡开卡界面并更新扫描图标
---
generallibrary/src/main/java/com/dayu/general/dao/BaseDaoSingleton.kt | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 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 610bcdc..1bcc754 100644
--- a/generallibrary/src/main/java/com/dayu/general/dao/BaseDaoSingleton.kt
+++ b/generallibrary/src/main/java/com/dayu/general/dao/BaseDaoSingleton.kt
@@ -8,24 +8,25 @@
class BaseDaoSingleton {
- var baseDao: AppDataBase? = null
+ 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 AsynchBaseDao: AppDataBase? = null
-
- var SqlitePath: String =
- Environment.getExternalStorageDirectory().absolutePath + File.separator + ".dayu" + File.separator + "data" + File.separator
-
- //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) {
@@ -38,9 +39,9 @@
return AsynchBaseDao
}
- companion object {
- fun getAsynchInstance(baseActivity: BaseActivity): AppDataBase? {
- return getAsynchInstance(baseActivity)
- }
- }
+// companion object {
+// fun getAsynchInstance(baseActivity: BaseActivity): AppDataBase? {
+// return getAsynchInstance(baseActivity)
+// }
+// }
}
\ No newline at end of file
--
Gitblit v1.8.0