chore(账号): 变更皮肤时，刷新整个衣橱 & 调整 UI

Author: MovTery

ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/content/AccountManageScreen.kt

@@ -33,14 +33,14 @@ import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateMapOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
@@ -113,7 +113,6 @@ import com.movtery.zalithlauncher.viewmodel.ScreenBackStackViewModel
  * @property checkIfInWebScreen 检查当前是否在浏览器界面中（用于微软登录逻辑判断）
  * @property formatError 格式化异常为本地化字符串
  * @property submitError 提交错误到全局错误展示系统
- * @property refreshAvatarMap 维护各个账号头像是否需要刷新的状态映射
  */
 private data class AccountActions(
     val onIntent: (AccountManageIntent) -> Unit,
@@ -123,7 +122,6 @@ private data class AccountActions(
     val checkIfInWebScreen: () -> Boolean,
     val formatError: (Context, Throwable) -> String,
     val submitError: (ErrorViewModel.ThrowableMessage) -> Unit,
-    val refreshAvatarMap: MutableMap<String, Boolean>
 )
 
 /**
@@ -148,9 +146,6 @@ fun AccountManageScreen(
     val profileUiState by viewModel.profileUiState.collectAsStateWithLifecycle()
     val operationUiState by viewModel.operationUiState.collectAsStateWithLifecycle()
 
-    // 头像刷新机制：ViewModel 发送 Effect，UI 层更新 refreshAvatarMap 触发局部重绘
-    val refreshAvatarMap = remember { mutableStateMapOf<String, Boolean>() }
-
     LaunchedEffect(Unit) {
         viewModel.effect.collect { effect ->
             when (effect) {
@@ -166,11 +161,6 @@ fun AccountManageScreen(
                     }
                     Toast.makeText(context, message, effect.duration).show()
                 }
-
-                is AccountManageEffect.RefreshAvatar -> {
-                    val current = refreshAvatarMap[effect.accountUuid] ?: false
-                    refreshAvatarMap[effect.accountUuid] = !current
-                }
             }
         }
     }
@@ -180,8 +170,7 @@ fun AccountManageScreen(
         backToMainScreen,
         openLink,
         backStackViewModel,
-        submitError,
-        refreshAvatarMap
+        submitError
     ) {
         AccountActions(
             onIntent = viewModel::onIntent,
@@ -191,7 +180,6 @@ fun AccountManageScreen(
             checkIfInWebScreen = { backStackViewModel.mainScreen.currentKey is NormalNavKey.WebScreen },
             formatError = { _, th -> viewModel.formatAccountError(th) },
             submitError = submitError,
-            refreshAvatarMap = refreshAvatarMap
         )
     }
 
@@ -289,35 +277,42 @@ private fun ActionsLayout(
             PlayerSkin(context)
         }
         var pageFinished by remember { mutableStateOf(false) }
-        AndroidView(
+        Box(
             modifier = Modifier
                 .weight(1f)
                 .fillMaxWidth(),
-            factory = { context ->
-                playerSkin.loadWebView(
-                    context = context,
-                    onPageFinished = {
-                        pageFinished = true
-                        playerSkin.startAnim(ModelAnimation.NewIdle)
-                    }
-                )
-            },
-            update = {
-                val account = currentAccount
-                if (account != null && pageFinished) {
-                    runCatching {
-                        accountSkin?.inputStream().use { inputStream ->
-                            playerSkin.loadSkin(inputStream, account.skinModelType)
+            contentAlignment = Alignment.Center
+        ) {
+            AndroidView(
+                modifier = Modifier.fillMaxSize(),
+                factory = { context ->
+                    playerSkin.loadWebView(
+                        context = context,
+                        onPageFinished = {
+                            pageFinished = true
+                            playerSkin.startAnim(ModelAnimation.NewIdle)
                         }
-                    }
-                    runCatching {
-                        accountCape?.inputStream().use { inputStream ->
-                            playerSkin.loadCape(inputStream)
+                    )
+                },
+                update = {
+                    if (currentAccount != null && pageFinished) {
+                        runCatching {
+                            accountSkin?.inputStream().use { inputStream ->
+                                playerSkin.loadSkin(inputStream, currentAccount.skinModelType)
+                            }
+                        }
+                        runCatching {
+                            accountCape?.inputStream().use { inputStream ->
+                                playerSkin.loadCape(inputStream)
+                            }
                         }
                     }
                 }
+            )
+            if (!pageFinished) {
+                CircularProgressIndicator()
             }
-        )
+        }
 
         //添加账号
         ScalingActionButton(
@@ -697,7 +692,6 @@ private fun AccountsLayout(
                             .padding(vertical = 6.dp),
                         currentAccount = currentAccount,
                         account = account,
-                        refreshKey = actions.refreshAvatarMap[account.uniqueUUID] ?: false,
                         onSelected = { AccountsManager.setCurrentAccount(it) },
                         openChangeSkinDialog = {
                             if (!account.isAuthServerAccount()) {
@@ -797,7 +791,7 @@ private fun AccountSkinOperation(
                         actions.onIntent(
                             AccountManageIntent.ApplyMicrosoftCape(
                                 account,
-                                cape.id.takeIf { cape != EmptyCape },
+                                cape.takeIf { cape != EmptyCape },
                                 name,
                                 cape == EmptyCape
                             )
@@ -866,7 +860,6 @@ private fun AccountManageContentPreview() {
                         checkIfInWebScreen = { false },
                         formatError = { _, _ -> "" },
                         submitError = {},
-                        refreshAvatarMap = mutableMapOf()
                     )
                 )
             }

ZalithLauncher/src/main/java/com/movtery/zalithlauncher/viewmodel/AccountManageViewModel.kt

@@ -49,6 +49,7 @@ import com.movtery.zalithlauncher.game.account.yggdrasil.PlayerProfile
 import com.movtery.zalithlauncher.game.account.yggdrasil.cacheAllCapes
 import com.movtery.zalithlauncher.game.account.yggdrasil.changeCape
 import com.movtery.zalithlauncher.game.account.yggdrasil.executeWithAuthorization
+import com.movtery.zalithlauncher.game.account.yggdrasil.getFile
 import com.movtery.zalithlauncher.game.account.yggdrasil.getPlayerProfile
 import com.movtery.zalithlauncher.game.account.yggdrasil.uploadSkin
 import com.movtery.zalithlauncher.path.PathManager
@@ -130,7 +131,7 @@ sealed interface AccountManageIntent {
     /** 应用选中的微软披风 */
     data class ApplyMicrosoftCape(
         val account: Account,
-        val capeId: String?,
+        val cape: PlayerProfile.Cape?,
         val capeName: String,
         val isReset: Boolean
     ) : AccountManageIntent
@@ -179,9 +180,6 @@ sealed class AccountManageEffect {
         val formatArgs: List<Any> = emptyList(),
         val duration: Int = Toast.LENGTH_SHORT
     ) : AccountManageEffect()
-
-    /** 通知 UI 层对应账号的头像数据已更新，需要重新加载显示 */
-    data class RefreshAvatar(val accountUuid: String) : AccountManageEffect()
 }
 
 /**
@@ -345,13 +343,6 @@ class AccountManageViewModel @Inject constructor(
         }
     }
 
-    /** 内部方法：触发头像重载副作用 */
-    private fun emitRefreshAvatar(accountUuid: String) {
-        viewModelScope.launch {
-            _effect.send(AccountManageEffect.RefreshAvatar(accountUuid))
-        }
-    }
-
     /** 执行微软登录流程 */
     private fun performMicrosoftLogin(intent: AccountManageIntent.PerformMicrosoftLogin) {
         microsoftLogin(
@@ -486,7 +477,8 @@ class AccountManageViewModel @Inject constructor(
     /** 更改微软账号披风 */
     private fun applyMicrosoftCape(intent: AccountManageIntent.ApplyMicrosoftCape) {
         val account = intent.account
-        val capeId = intent.capeId
+        val cape = intent.cape
+        val capeId = cape?.id
         val capeName = intent.capeName
         val isReset = intent.isReset
 
@@ -503,6 +495,18 @@ class AccountManageViewModel @Inject constructor(
                         AccountsManager.suspendSaveAccount(account)
                     })
 
+                    val capeFile = cape?.getFile(PathManager.DIR_ACCOUNT_CAPE)
+                    val targetCape = account.getCapeFile()
+                    if (capeFile?.exists() == true) {
+                        runCatching {
+                            FileUtils.deleteQuietly(targetCape)
+                            capeFile.copyTo(targetCape)
+                        }
+                    } else {
+                        FileUtils.deleteQuietly(targetCape)
+                    }
+                    AccountsManager.refreshWardrobe()
+
                     _accountCapeOpMap.update { capesMap ->
                         if (!capesMap.containsKey(account.uniqueUUID)) return@update capesMap
                         buildMap {
@@ -602,7 +606,7 @@ class AccountManageViewModel @Inject constructor(
                 cacheFile.copyTo(skinFile, true)
                 FileUtils.deleteQuietly(cacheFile)
                 AccountsManager.suspendSaveAccount(account)
-                emitRefreshAvatar(account.uniqueUUID)
+                AccountsManager.refreshWardrobe()
                 onIntent(
                     AccountManageIntent.UpdateAccountSkinOp(
                         account.uniqueUUID,
@@ -624,7 +628,7 @@ class AccountManageViewModel @Inject constructor(
         }, onError = { th ->
             FileUtils.deleteQuietly(cacheFile)
             emitError(context.getString(R.string.error_import_image), th.getMessageOrToString())
-            emitRefreshAvatar(account.uniqueUUID)
+            AccountsManager.refreshWardrobe()
             onIntent(
                 AccountManageIntent.UpdateAccountSkinOp(
                     account.uniqueUUID,
@@ -642,7 +646,7 @@ class AccountManageViewModel @Inject constructor(
                 skinModelType = SkinModelType.NONE
                 profileId = getLocalUUIDWithSkinModel(username, skinModelType)
                 AccountsManager.suspendSaveAccount(this)
-                emitRefreshAvatar(account.uniqueUUID)
+                AccountsManager.refreshWardrobe()
             }
         }))
         onIntent(