From 1f1cb1ba55a678565222647b183f1d39bfd394af Mon Sep 17 00:00:00 2001
From: shenzuqiang <zuqiangshen@163.com>
Date: Thu, 12 Mar 2026 15:39:23 +0800
Subject: [PATCH] =?UTF-8?q?Dev=EF=BC=9A=201=E3=80=81=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=88=87=E6=8D=A2=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetSelector.xml            |  2 +-
 .../java/com/img/rabbit/pages/MainPage.kt     |  2 +-
 .../mine/setting/AccountManagerScreen.kt      | 21 +++++--------------
 .../viewmodel/AccountManagerViewModel.kt      |  8 +++++++
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 1285328..ba5e69d 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -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" />
diff --git a/app/src/main/java/com/img/rabbit/pages/MainPage.kt b/app/src/main/java/com/img/rabbit/pages/MainPage.kt
index f359c70..0224531 100644
--- a/app/src/main/java/com/img/rabbit/pages/MainPage.kt
+++ b/app/src/main/java/com/img/rabbit/pages/MainPage.kt
@@ -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)
diff --git a/app/src/main/java/com/img/rabbit/pages/screen/mine/setting/AccountManagerScreen.kt b/app/src/main/java/com/img/rabbit/pages/screen/mine/setting/AccountManagerScreen.kt
index a2d2f94..6958789 100644
--- a/app/src/main/java/com/img/rabbit/pages/screen/mine/setting/AccountManagerScreen.kt
+++ b/app/src/main/java/com/img/rabbit/pages/screen/mine/setting/AccountManagerScreen.kt
@@ -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())
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/img/rabbit/viewmodel/AccountManagerViewModel.kt b/app/src/main/java/com/img/rabbit/viewmodel/AccountManagerViewModel.kt
index 1400c52..d4905f4 100644
--- a/app/src/main/java/com/img/rabbit/viewmodel/AccountManagerViewModel.kt
+++ b/app/src/main/java/com/img/rabbit/viewmodel/AccountManagerViewModel.kt
@@ -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{