From 8521954fa97bdfc54123afb4a72755ece311db06 Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期五, 21 三月 2025 14:45:45 +0800
Subject: [PATCH] feat(general): 更新登录逻辑和用户信息展示
---
generallibrary/src/main/java/com/dayu/general/BaseApplication.kt | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/generallibrary/src/main/java/com/dayu/general/BaseApplication.kt b/generallibrary/src/main/java/com/dayu/general/BaseApplication.kt
index 6349cfc..15842a8 100644
--- a/generallibrary/src/main/java/com/dayu/general/BaseApplication.kt
+++ b/generallibrary/src/main/java/com/dayu/general/BaseApplication.kt
@@ -3,6 +3,7 @@
import android.app.Application
import android.nfc.Tag
import com.dayu.general.dao.BaseDaoSingleton
+import com.dayu.general.dao.ProjectDataDao
class BaseApplication private constructor() {
@@ -15,29 +16,44 @@
@Volatile
private var myApplication: BaseApplication? = null
- private var Tag : String ?= ""
- var projectDataDao = BaseDaoSingleton.getInstance(application)?.projectDataDao()
+ 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(application: Application): BaseApplication {
if (myApplication == null) {
- myApplication = BaseApplication()
BaseApplication.application = application
+ myApplication = BaseApplication().apply {
+ // 閫氳繃瀹炰緥璋冪敤 init()
+ init()
+ }
}
- return myApplication as BaseApplication
+ return myApplication as BaseApplication
}
+
}
-
-
- fun init() {
- if (projectDataDao!=null){
- val projectDataBean = projectDataDao?.findFirst()
- if (projectDataBean!=null){
- Tag = projectDataBean.projectTag
- }
- }
+ fun init() {
+ projectDataDao = application?.let { BaseDaoSingleton.getInstance(it)?.projectDataDao() }
+ if (projectDataDao != null) {
+ val projectDataBean = projectDataDao?.findFirst()
+ if (projectDataBean != null) {
+ tag = projectDataBean.projectTag
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0