shenzuqiang/rabbit-android
shenzuqiang
/
rabbit-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dev： 

1、优化账号切换代码
This commit is contained in:
shenzuqiang 2026-03-12 15:39:23 +08:00
parent 86bc47ca7f
commit 1f1cb1ba55
4 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/deploymentTargetSelector.xml
View File

@ -4,7 +4,7 @@
<selectionStates>
<SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" />
<DropdownSelection timestamp="2026-03-12T03:05:40.770377400Z">
<DropdownSelection timestamp="2026-03-12T07:23:49.466247900Z">
<Target type="DEFAULT_BOOT">
<handle>
<DeviceId pluginId="PhysicalDevice" identifier="serial=JRBI89BIE6AI5TG6" />

2
app/src/main/java/com/img/rabbit/pages/MainPage.kt
View File

@ -224,7 +224,7 @@ fun MainScreen(generalViewModel: GeneralViewModel, loginViewModel: LoginViewMode
AccountBindScreen(navController = navController)
}
composable(ScreenRoute.ManagerAccount.route) {
AccountManagerScreen(navController = navController, loginViewModel = loginViewModel)
AccountManagerScreen(navController = navController)
}
composable(ScreenRoute.AboutMine.route) {
AboutScreen(navController = navController)

21
app/src/main/java/com/img/rabbit/pages/screen/mine/setting/AccountManagerScreen.kt
View File

@ -1,6 +1,5 @@
package com.img.rabbit.pages.screen.mine.setting
import android.annotation.SuppressLint
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.border
@ -34,7 +33,6 @@ import androidx.compose.ui.draw.scale
import androidx.compose.ui.draw.shadow
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
@ -51,20 +49,16 @@ import com.img.rabbit.components.CenterToast
import com.img.rabbit.pages.dialog.TipsDialog
import com.img.rabbit.pages.toolbar.TitleBar
import com.img.rabbit.provider.storage.PreferenceUtil
import com.img.rabbit.utils.AppEventBus
import com.img.rabbit.utils.LoginBindEvent
import com.img.rabbit.viewmodel.AccountManagerViewModel
import com.img.rabbit.viewmodel.LoginViewModel
import kotlinx.coroutines.delay
@SuppressLint("UnrememberedMutableState")
@Composable
fun AccountManagerScreen(navController: NavHostController, viewModel: AccountManagerViewModel = viewModel(), loginViewModel: LoginViewModel) {
val context = LocalContext.current
var showDialogStatus by mutableStateOf(false)
var selectedUserInfo by mutableStateOf<UserInfoEntity?>(null)
fun AccountManagerScreen(navController: NavHostController, viewModel: AccountManagerViewModel = viewModel()) {
var showDialogStatus by remember { mutableStateOf(false) }
var selectedUserInfo by remember { mutableStateOf<UserInfoEntity?>(null) }
val userList by remember { viewModel.accountState }
val userList by viewModel.accountState
LaunchedEffect(Unit) {
viewModel.requestAccount()
@ -72,11 +66,6 @@ fun AccountManagerScreen(navController: NavHostController, viewModel: AccountMan
LaunchedEffect(viewModel.switchState.value) {
if (viewModel.switchState.value != null && viewModel.switchState.value?.data?.token != null) {
val loginInfo = viewModel.switchState.value?.data
PreferenceUtil.saveLoginType(null)
loginInfo?.let { PreferenceUtil.saveLoginInfo(it) }
PreferenceUtil.saveAccessToken(viewModel.switchState.value?.data?.token)
AppEventBus.post( LoginBindEvent.Login(userId = loginInfo?.user_id?:"", loginType = null, isLogin = true, data = loginInfo) )
CenterToast.show("切换账号成功！")
//延迟执行，确保返回时，接口已经拿到最新的用户信息
@ -336,5 +325,5 @@ private fun AddItem(navController: NavController){
@Preview(showBackground = true)
@Composable
private fun PreviewAccountManagerScreen(){
AccountManagerScreen(navController = rememberNavController(), loginViewModel = viewModel())
AccountManagerScreen(navController = rememberNavController())
}

8
app/src/main/java/com/img/rabbit/viewmodel/AccountManagerViewModel.kt
View File

@ -8,6 +8,9 @@ import com.img.rabbit.bean.response.LoginInfoEntity
import com.img.rabbit.bean.response.UserInfoEntity
import com.img.rabbit.provider.api.ApiManager
import com.img.rabbit.provider.api.ResultVo
import com.img.rabbit.provider.storage.PreferenceUtil
import com.img.rabbit.utils.AppEventBus
import com.img.rabbit.utils.LoginBindEvent
import okhttp3.RequestBody.Companion.toRequestBody
class AccountManagerViewModel : BaseViewModel() {
@ -43,6 +46,11 @@ class AccountManagerViewModel : BaseViewModel() {
mLaunch {
val response = ApiManager.serviceVo.login(jsonObject.toString().toRequestBody())
if (response.status) {
val loginInfo = response.data
PreferenceUtil.saveLoginType(null)
PreferenceUtil.saveLoginInfo(loginInfo)
PreferenceUtil.saveAccessToken(loginInfo.token)
AppEventBus.post( LoginBindEvent.Login(userId = loginInfo.user_id, loginType = null, isLogin = true, data = loginInfo) )
// 处理切换账号
switchState.value = response
}else{