From 0faae97cd2523f840c426da68464e577e01dfa80 Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期一, 23 六月 2025 20:35:08 +0800
Subject: [PATCH] refactor(CardReplaceActivity): 重构补卡流程并优化界面显示- 重新设计卡片信息展示布局，增加新卡卡地址、客户编号等字段 - 优化补卡逻辑，支持通过卡号或客户编号获取卡片信息 -调整工本费和返回金额输入框位置 - 更新API调用路径，使用新的卡片查询接口
---
generallibrary/src/main/java/com/dayu/general/dao/BaseDaoSingleton.kt | 75 ++++++++++++++++++++++++-------------
1 files changed, 49 insertions(+), 26 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 825209a..a58d63f 100644
--- a/generallibrary/src/main/java/com/dayu/general/dao/BaseDaoSingleton.kt
+++ b/generallibrary/src/main/java/com/dayu/general/dao/BaseDaoSingleton.kt
@@ -3,40 +3,63 @@
import android.content.Context
import android.os.Environment
import androidx.room.Room
-import com.dayu.general.activity.BaseActivity
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
import java.io.File
class BaseDaoSingleton {
- var baseDao: AppDataBase? = null
+ companion object {
+ var baseDao: AppDataBase? = null
+ var AsynchBaseDao: AppDataBase? = null
+ @JvmField
+ val SqlitePath: String =
+ Environment.getExternalStorageDirectory().absolutePath + File.separator + ".dayu" + File.separator + "data" + File.separator
- 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()
+ // 鏁版嵁搴撹縼绉荤瓥鐣ワ細浠庣増鏈�3杩佺Щ鍒扮増鏈�4
+ private val MIGRATION_3_4 = object : Migration(3, 4) {
+ override fun migrate(database: SupportSQLiteDatabase) {
+ // 杩欓噷涓嶉渶瑕佸疄闄呯殑鏁版嵁搴撶粨鏋勪慨鏀癸紝鍥犱负鎴戜滑鍙槸鏇存柊浜哛oom鐗堟湰
+ // 濡傛灉闇�瑕佷慨鏀规暟鎹簱缁撴瀯锛屽彲浠ュ湪杩欓噷娣诲姞 ALTER TABLE 璇彞
+ }
}
- return baseDao
+
+ 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
+ }
+ fun getAsynchInstance(context: Context): AppDataBase {
+ if (AsynchBaseDao == null) {
+ synchronized(this) {
+ if (AsynchBaseDao == null) {
+ AsynchBaseDao = Room.databaseBuilder(
+ context.applicationContext,
+ AppDataBase::class.java,
+ "GeneralLibrary.db"
+ )
+ .addMigrations(MIGRATION_3_4) // 娣诲姞杩佺Щ绛栫暐
+ .build()
+ }
+ }
+ }
+ return AsynchBaseDao as AppDataBase
+ }
+
+ // 閿�姣佹暟鎹簱瀹炰緥
+ fun destroyInstance() {
+ AsynchBaseDao = null
+ }
}
- fun getAsynchInstance(context: Context?): AppDataBase? {
- if (AsynchBaseDao == null) {
- AsynchBaseDao = Room.databaseBuilder<AppDataBase>(
- context!!,
- AppDataBase::class.java,
- SqlitePath + "ConfigurationData_generalV1"
- ).build()
- }
- return AsynchBaseDao
- }
+
+
+
// companion object {
// fun getAsynchInstance(baseActivity: BaseActivity): AppDataBase? {
--
Gitblit v1.8.0