diff --git a/app/src/main/java/com/gamedog/vididin/beans/User.kt b/app/src/main/java/com/gamedog/vididin/beans/User.kt index 7530481..27184d9 100644 --- a/app/src/main/java/com/gamedog/vididin/beans/User.kt +++ b/app/src/main/java/com/gamedog/vididin/beans/User.kt @@ -2,9 +2,8 @@ package com.gamedog.vididin.beans data class User( - val id: Int, + val accountId: String, + val deviceUUId: String, val token: String, - val account: String, - val createdAt: String, - val deviceUUId: String -) + val createdAt: Long, + ) diff --git a/app/src/main/java/com/gamedog/vididin/login/LoginManager.kt b/app/src/main/java/com/gamedog/vididin/login/LoginManager.kt index 7df263a..ceb20c2 100644 --- a/app/src/main/java/com/gamedog/vididin/login/LoginManager.kt +++ b/app/src/main/java/com/gamedog/vididin/login/LoginManager.kt @@ -1,20 +1,76 @@ package com.gamedog.vididin.core.login.login +import com.ama.core.architecture.BaseApp +import com.ama.core.architecture.util.AsyncUtil +import com.ama.core.architecture.util.SpUtil import com.gamedog.vididin.beans.OnLoginStateEvent import com.gamedog.vididin.beans.User import com.gamedog.vididin.login.LoginInfoSave import com.gamedog.vididin.login.OnLoginEvent import com.gamedog.vididin.router.Router import com.pengxr.modular.eventbus.generated.events.EventDefineOfUserEvents - +import dagger.hilt.android.EntryPointAccessors +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.launch object LoginManager { + private var mAccount: User? = null + + fun initAccount() { + AsyncUtil.doGlobalAsync({ + SpUtil.instance().getObject(SpUtil.KEY_ACCOUNT) + }, onComplete = { item-> + mAccount = item + if (mAccount == null) { + + } else { + + } + }) + + + + + + + /*val loginEntryPoint = EntryPointAccessors.fromApplication(BaseApp.appContext(), LoginEntryPoint::class.java) + + preferencesDataSource = loginEntryPoint.appPreferencesDataSource() + applicationScope = loginEntryPoint.applicationScope() + + isLoggedFlow = preferencesDataSource.userData.map { it.user }.distinctUntilChanged() + .map { it.id != 0 && it.token.isNotEmpty() } + // 启动监听 + applicationScope.launch { + isLoggedFlow.collect { + isCurrentLogged = it + } + }*/ + } + + + + + + + + + + + + + + // old --------------------------------- + private val loginInfoSave by lazy { LoginInfoSave() } + + var user: User? = null set(value) { loginInfoSave.putUser(value)