From 8bf9cd0bee45cfc675b0d2ff0ebcd73e5c9799bc Mon Sep 17 00:00:00 2001 From: ShirkNeko <109797057+ShirkNeko@users.noreply.github.com> Date: Sat, 31 May 2025 19:17:43 +0800 Subject: [PATCH] manager: Add initialization to optimize loading of SuperUser and Home data --- .../java/com/sukisu/ultra/ui/MainActivity.kt | 30 ++++++++++++ .../java/com/sukisu/ultra/ui/screen/Home.kt | 7 +-- .../com/sukisu/ultra/ui/screen/SuperUser.kt | 2 +- .../ultra/ui/viewmodel/HomeViewModel.kt | 47 +++++++++++++++---- .../ultra/ui/viewmodel/SuperUserViewModel.kt | 4 +- 5 files changed, 73 insertions(+), 17 deletions(-) diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/MainActivity.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/MainActivity.kt index 91ed399c..4b931cd3 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/MainActivity.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/MainActivity.kt @@ -44,8 +44,15 @@ import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.slideInVertically import androidx.compose.animation.slideOutVertically import androidx.navigation.compose.currentBackStackEntryAsState +import androidx.lifecycle.lifecycleScope +import com.sukisu.ultra.ui.viewmodel.HomeViewModel +import com.sukisu.ultra.ui.viewmodel.SuperUserViewModel +import kotlinx.coroutines.launch class MainActivity : ComponentActivity() { + private lateinit var superUserViewModel: SuperUserViewModel + private lateinit var homeViewModel: HomeViewModel + private inner class ThemeChangeContentObserver( handler: Handler, private val onThemeChanged: () -> Unit @@ -111,6 +118,21 @@ class MainActivity : ComponentActivity() { super.onCreate(savedInstanceState) + // 初始化 SuperUserViewModel + superUserViewModel = SuperUserViewModel() + + lifecycleScope.launch { + superUserViewModel.fetchAppList() + } + + // 初始化 HomeViewModel + homeViewModel = HomeViewModel() + + // 预加载数据 + lifecycleScope.launch { + homeViewModel.initializeData() + } + val prefs = getSharedPreferences("settings", MODE_PRIVATE) val isFirstRun = prefs.getBoolean("is_first_run", true) @@ -237,6 +259,14 @@ class MainActivity : ComponentActivity() { if (!ThemeConfig.backgroundImageLoaded && !ThemeConfig.preventBackgroundRefresh) { loadCustomBackground() } + + lifecycleScope.launch { + superUserViewModel.fetchAppList() + } + + lifecycleScope.launch { + homeViewModel.initializeData() + } } private val destroyListeners = mutableListOf<() -> Unit>() diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Home.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Home.kt index 5e9db3af..4206b491 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Home.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/Home.kt @@ -42,7 +42,7 @@ import androidx.compose.material.icons.filled.Security import androidx.compose.material.icons.filled.SettingsSuggest import androidx.compose.material.icons.filled.Storage import androidx.compose.material.icons.outlined.Block -import androidx.compose.material.icons.outlined.CheckCircle +import androidx.compose.material.icons.outlined.TaskAlt import androidx.compose.material.icons.outlined.Warning import androidx.compose.material3.CardDefaults import androidx.compose.material3.DropdownMenu @@ -121,11 +121,8 @@ fun HomeScreen(navigator: DestinationsNavigator) { val coroutineScope = rememberCoroutineScope() LaunchedEffect(Unit) { - // 初始化加载用户设置 viewModel.loadUserSettings(context) - // 初始化数据 viewModel.initializeData() - // 检查更新 viewModel.checkForUpdates(context) } @@ -370,7 +367,7 @@ private fun StatusCard( } Icon( - Icons.Outlined.CheckCircle, + Icons.Outlined.TaskAlt, contentDescription = stringResource(R.string.home_working), tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(24.dp) diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/SuperUser.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/SuperUser.kt index cd81b393..7a2da61a 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/SuperUser.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/SuperUser.kt @@ -72,7 +72,7 @@ fun SuperUserScreen(navigator: DestinationsNavigator) { LaunchedEffect(key1 = navigator) { viewModel.search = "" if (viewModel.appList.isEmpty()) { - viewModel.fetchAppList() + // viewModel.fetchAppList() } } diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/viewmodel/HomeViewModel.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/viewmodel/HomeViewModel.kt index 190aa8f3..ca618655 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/viewmodel/HomeViewModel.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/viewmodel/HomeViewModel.kt @@ -33,13 +33,12 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import com.topjohnwu.superuser.internal.Utils.context -/** - * @author ShirkNeko - * @date 2025/5/31. - */ class HomeViewModel : ViewModel() { companion object { private const val TAG = "HomeViewModel" + private val systemStatusCache = mutableMapOf() + private val systemInfoCache = mutableMapOf() + private val versionInfoCache = mutableMapOf() } // 系统状态 @@ -117,8 +116,20 @@ class HomeViewModel : ViewModel() { // 初始化数据 fun initializeData() { viewModelScope.launch { - fetchSystemStatus() - fetchSystemInfo() + val cachedStatus = systemStatusCache["status"] + val cachedInfo = systemInfoCache["info"] + + if (cachedStatus != null) { + systemStatus = cachedStatus + } else { + fetchSystemStatus() + } + + if (cachedInfo != null) { + systemInfo = cachedInfo + } else { + fetchSystemInfo() + } } } @@ -130,8 +141,17 @@ class HomeViewModel : ViewModel() { .getBoolean("check_update", true) if (checkUpdate) { + val cachedVersion = versionInfoCache["version"] + + if (cachedVersion != null) { + latestVersionInfo = cachedVersion + return@launch + } + val start = SystemClock.elapsedRealtime() - latestVersionInfo = checkNewVersion() + val newVersionInfo = checkNewVersion() + latestVersionInfo = newVersionInfo + versionInfoCache["version"] = newVersionInfo Log.i(TAG, "Update check completed in ${SystemClock.elapsedRealtime() - start}ms") } } catch (e: Exception) { @@ -145,6 +165,9 @@ class HomeViewModel : ViewModel() { isRefreshing = true viewModelScope.launch { try { + systemStatusCache.clear() + systemInfoCache.clear() + versionInfoCache.clear() fetchSystemStatus() fetchSystemInfo() checkForUpdates(context) @@ -165,7 +188,7 @@ class HomeViewModel : ViewModel() { if (it >= Natives.MINIMAL_SUPPORTED_KERNEL_LKM && kernelVersion.isGKI()) Natives.isLkmMode else null } - systemStatus = SystemStatus( + val newStatus = SystemStatus( isManager = isManager, ksuVersion = ksuVersion, lkmMode = lkmMode, @@ -174,6 +197,9 @@ class HomeViewModel : ViewModel() { isKpmConfigured = Natives.isKPMEnabled(), requireNewKernel = isManager && Natives.requireNewKernel() ) + + systemStatus = newStatus + systemStatusCache["status"] = newStatus } catch (e: Exception) { Log.e(TAG, "Error fetching system status", e) } @@ -209,7 +235,7 @@ class HomeViewModel : ViewModel() { } } - systemInfo = SystemInfo( + val newInfo = SystemInfo( kernelRelease = uname.release, androidVersion = Build.VERSION.RELEASE, deviceModel = getDeviceModel(), @@ -225,6 +251,9 @@ class HomeViewModel : ViewModel() { moduleCount = getModuleCount(), kpmModuleCount = getKpmModuleCount() ) + + systemInfo = newInfo + systemInfoCache["info"] = newInfo } catch (e: Exception) { Log.e(TAG, "Error fetching system info", e) } diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/viewmodel/SuperUserViewModel.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/viewmodel/SuperUserViewModel.kt index ddc19793..ea02ff05 100644 --- a/manager/app/src/main/java/com/sukisu/ultra/ui/viewmodel/SuperUserViewModel.kt +++ b/manager/app/src/main/java/com/sukisu/ultra/ui/viewmodel/SuperUserViewModel.kt @@ -34,7 +34,7 @@ class SuperUserViewModel : ViewModel() { val isPlatformAlive get() = Platform.isAlive companion object { private const val TAG = "SuperUserViewModel" - private var apps by mutableStateOf>(emptyList()) + var apps by mutableStateOf>(emptyList()) } @Parcelize @@ -171,7 +171,7 @@ class SuperUserViewModel : ViewModel() { fetchAppList() // 刷新列表以显示最新状态 } - // 仅更新本地应用配置，避免重新获取整个列表导致滚动位置重置 + // 更新本地应用配置 fun updateAppProfileLocally(packageName: String, updatedProfile: Natives.Profile) { apps = apps.map { app -> if (app.packageName == packageName) {