From bd4891e2fd6b773cbb0ec387f6db4bc944fdf51a Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 31 三月 2025 18:07:51 +0800
Subject: [PATCH] feat(generallibrary): 添加卡片列表功能并优化登录逻辑
---
generallibrary/src/main/java/com/dayu/general/BaseApplication.kt | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/generallibrary/src/main/java/com/dayu/general/BaseApplication.kt b/generallibrary/src/main/java/com/dayu/general/BaseApplication.kt
index 8d924d2..15842a8 100644
--- a/generallibrary/src/main/java/com/dayu/general/BaseApplication.kt
+++ b/generallibrary/src/main/java/com/dayu/general/BaseApplication.kt
@@ -1,6 +1,9 @@
package com.dayu.general
import android.app.Application
+import android.nfc.Tag
+import com.dayu.general.dao.BaseDaoSingleton
+import com.dayu.general.dao.ProjectDataDao
class BaseApplication private constructor() {
@@ -13,13 +16,43 @@
@Volatile
private var myApplication: BaseApplication? = null
+ var tag: String = ""
+ var token: String = ""
+ var userId: String = ""
+
+ var userName: String = ""
+ var userPhone: String = ""
+
+ //鐗囧尯淇℃伅
+ var blockId:String=""
+ var blockName:String=""
+
+
+ var projectDataDao: ProjectDataDao? = null
+
@JvmStatic
- fun getInstance(): BaseApplication {
- return myApplication ?: synchronized(this) {
- myApplication ?: BaseApplication().also {
- myApplication = it
+ fun getInstance(application: Application): BaseApplication {
+ if (myApplication == null) {
+ BaseApplication.application = application
+ myApplication = BaseApplication().apply {
+ // 閫氳繃瀹炰緥璋冪敤 init()
+ init()
}
}
+ return myApplication as BaseApplication
+ }
+
+
+
+
+ }
+ fun init() {
+ projectDataDao = application?.let { BaseDaoSingleton.getInstance(it)?.projectDataDao() }
+ if (projectDataDao != null) {
+ val projectDataBean = projectDataDao?.findFirst()
+ if (projectDataBean != null) {
+ tag = projectDataBean.projectTag
+ }
}
}
--
Gitblit v1.8.0