perf: app info list

lisonge · lisonge · commit 265b3d9a0a66 · 2025-04-04T19:37:19.000+08:00
diff --git a/app/src/main/kotlin/li/songe/gkd/MainActivity.kt b/app/src/main/kotlin/li/songe/gkd/MainActivity.kt
@@ -125,9 +125,11 @@ class MainActivity : ComponentActivity() {
         activityVisibleFlow.update { it + 1 }
     }
 
+    var isFirstResume = true
     override fun onResume() {
         super.onResume()
-        if (startTime - app.startTime < 2000) {
+        if (isFirstResume && startTime - app.startTime < 2000) {
+            isFirstResume = false
             return
         }
         syncFixState()
diff --git a/app/src/main/kotlin/li/songe/gkd/permission/PermissionState.kt b/app/src/main/kotlin/li/songe/gkd/permission/PermissionState.kt
@@ -255,17 +255,17 @@ fun startQueryPkgSettingActivity(context: Activity) {
 }
 
 fun updatePermissionState() {
+    val stateChanged = canQueryPkgState.stateFlow.value != canQueryPkgState.updateAndGet()
+    if (!updateAppMutex.mutex.isLocked && (stateChanged || mayQueryPkgNoAccessFlow.value)) {
+        appScope.launchTry(Dispatchers.IO) {
+            initOrResetAppInfoCache()
+        }
+    }
     arrayOf(
         notificationState,
         canDrawOverlaysState,
         canWriteExternalStorage,
         writeSecureSettingsState,
         shizukuOkState,
     ).forEach { it.updateAndGet() }
-    val stateChanged = canQueryPkgState.stateFlow.value != canQueryPkgState.updateAndGet()
-    if (!updateAppMutex.mutex.isLocked && (stateChanged || mayQueryPkgNoAccessFlow.value)) {
-        appScope.launchTry(Dispatchers.IO) {
-            initOrResetAppInfoCache()
-        }
-    }
 }
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/AppConfigPage.kt b/app/src/main/kotlin/li/songe/gkd/ui/AppConfigPage.kt
@@ -53,7 +53,6 @@ import com.ramcosta.composedestinations.utils.toDestinationsNavigator
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.update
 import li.songe.gkd.data.RawSubscription
-import li.songe.gkd.data.Value
 import li.songe.gkd.ui.component.AnimationFloatingActionButton
 import li.songe.gkd.ui.component.AppNameText
 import li.songe.gkd.ui.component.BatchActionButtonGroup
@@ -77,6 +76,7 @@ import li.songe.gkd.util.launchAsFn
 import li.songe.gkd.util.storeFlow
 import li.songe.gkd.util.switchItem
 import li.songe.gkd.util.throttle
+import java.util.Objects
 
 @Destination<RootGraph>(style = ProfileTransitions::class)
 @Composable
@@ -87,16 +87,10 @@ fun AppConfigPage(appId: String) {
     val ruleSortType by vm.ruleSortTypeFlow.collectAsState()
     val groupSize by vm.groupSizeFlow.collectAsState()
     val firstLoading by vm.linkLoad.firstLoadingFlow.collectAsState()
-    val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior()
-    val listState = key(groupSize > 0) { rememberLazyListState() }
-    val isFirstVisit = remember { Value(true) }
-    LaunchedEffect(ruleSortType.value) {
-        if (isFirstVisit.value) {
-            isFirstVisit.value = false
-        } else {
-            listState.scrollToItem(0)
-        }
-    }
+    val resetKey = Objects.hash(groupSize > 0, ruleSortType.value)
+    val scrollBehavior = key(resetKey) { TopAppBarDefaults.enterAlwaysScrollBehavior() }
+    val listState = key(resetKey) { rememberLazyListState() }
+
     val isSelectedMode = vm.isSelectedModeFlow.collectAsState().value
     val selectedDataSet = vm.selectedDataSetFlow.collectAsState().value
     LaunchedEffect(key1 = isSelectedMode) {
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/GlobalGroupExcludePage.kt b/app/src/main/kotlin/li/songe/gkd/ui/GlobalGroupExcludePage.kt
@@ -113,18 +113,9 @@ fun GlobalGroupExcludePage(subsItemId: Long, groupKey: Int) {
             vm.searchStrFlow.value = ""
         }
     })
-    val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior()
-    val listState = rememberLazyListState()
-    var isFirstVisit by remember { mutableStateOf(true) }
-    LaunchedEffect(
-        key1 = showAppInfos.mapHashCode { it.id },
-    ) {
-        if (isFirstVisit) {
-            isFirstVisit = false
-        } else {
-            listState.scrollToItem(0)
-        }
-    }
+    val resetKey = showAppInfos.mapHashCode { it.id }
+    val scrollBehavior = key(resetKey) { TopAppBarDefaults.enterAlwaysScrollBehavior() }
+    val listState = key(resetKey) { rememberLazyListState() }
     var expanded by remember { mutableStateOf(false) }
     val softwareKeyboardController = LocalSoftwareKeyboardController.current
     Scaffold(modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), topBar = {
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/SubsAppListPage.kt b/app/src/main/kotlin/li/songe/gkd/ui/SubsAppListPage.kt
@@ -29,6 +29,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.key
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
@@ -95,21 +96,13 @@ fun SubsAppListPage(
             vm.searchStrFlow.value = ""
         }
     })
-    val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior()
+    val resetKey = appAndConfigs.mapHashCode { it.first.id }
+    val scrollBehavior = key(resetKey) { TopAppBarDefaults.enterAlwaysScrollBehavior() }
+    val listState = key(resetKey) { rememberLazyListState() }
     var expanded by remember { mutableStateOf(false) }
     val showUninstallApp by vm.showUninstallAppFlow.collectAsState()
     val sortType by vm.sortTypeFlow.collectAsState()
-    val listState = rememberLazyListState()
-    var isFirstVisit by remember { mutableStateOf(true) }
-    LaunchedEffect(
-        key1 = appAndConfigs.mapHashCode { it.first.id }
-    ) {
-        if (isFirstVisit) {
-            isFirstVisit = false
-        } else {
-            listState.scrollToItem(0)
-        }
-    }
+
     val softwareKeyboardController = LocalSoftwareKeyboardController.current
     Scaffold(
         modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/home/AppListPage.kt b/app/src/main/kotlin/li/songe/gkd/ui/home/AppListPage.kt
@@ -93,8 +93,9 @@ fun useAppListPage(): ScaffoldExt {
         null
     }
     val showSearchBar by vm.showSearchBarFlow.collectAsState()
-    val listState = key(orderedAppInfos.mapHashCode { it.id }) { rememberLazyListState() }
-    val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior()
+    val resetKey = orderedAppInfos.mapHashCode { it.id }
+    val scrollBehavior = key(resetKey) { TopAppBarDefaults.enterAlwaysScrollBehavior() }
+    val listState = key(resetKey) { rememberLazyListState() }
     return ScaffoldExt(
         navItem = appListNav,
         modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
diff --git a/app/src/main/kotlin/li/songe/gkd/util/AppInfoState.kt b/app/src/main/kotlin/li/songe/gkd/util/AppInfoState.kt
@@ -22,6 +22,7 @@ import li.songe.gkd.app
 import li.songe.gkd.appScope
 import li.songe.gkd.data.AppInfo
 import li.songe.gkd.data.toAppInfo
+import li.songe.gkd.permission.canQueryPkgState
 
 val userAppInfoMapFlow = MutableStateFlow(emptyMap<String, AppInfo>())
 val allPackageInfoMapFlow = MutableStateFlow(emptyMap<Int, List<PackageInfo>>())
@@ -47,13 +48,15 @@ val orderedAppInfosFlow by lazy {
     }
 }
 
+private fun Map<String, AppInfo>.getMayQueryPkgNoAccess(): Boolean {
+    return values.count { a -> !a.isSystem && !a.hidden && a.id != META.appId } < MINIMUM_NORMAL_APP_SIZE
+}
+
 // https://github.com/orgs/gkd-kit/discussions/761
 // 某些设备在应用更新后出现权限错乱/缓存错乱
 private const val MINIMUM_NORMAL_APP_SIZE = 8
 val mayQueryPkgNoAccessFlow by lazy {
-    userAppInfoMapFlow.map(appScope) { c ->
-        c.values.count { a -> !a.isSystem && !a.hidden && a.id != META.appId } < MINIMUM_NORMAL_APP_SIZE
-    }
+    userAppInfoMapFlow.map(appScope) { it.getMayQueryPkgNoAccess() }
 }
 
 private val willUpdateAppIds by lazy { MutableStateFlow(emptySet<String>()) }
@@ -131,14 +134,27 @@ suspend fun initOrResetAppInfoCache() = updateAppMutex.withLock {
                 }
             }
     }
+    if (!canQueryPkgState.updateAndGet() || appMap.getMayQueryPkgNoAccess()) {
+        withContext(Dispatchers.IO) {
+            app.packageManager.queryIntentActivities(
+                Intent(Intent.ACTION_MAIN),
+                0
+            ).map { it.activityInfo.packageName }.toSet().forEach { appId ->
+                if (!appMap.contains(appId)) {
+                    getAppInfo(appId)?.let {
+                        appMap[appId] = it
+                    }
+                }
+            }
+        }
+    }
     userAppInfoMapFlow.value = appMap
     LogUtils.d("initOrResetAppInfoCache end ${oldAppIds.size}->${appMap.size}")
 }
 
 fun initAppState() {
     packageReceiver
     appScope.launchTry(Dispatchers.IO) {
-        initOrResetAppInfoCache()
         willUpdateAppIds.debounce(1000)
             .filter { it.isNotEmpty() }
             .collect { updateAppInfo(it) }

Original file line number	Diff line number	Diff line change
`@@ -125,9 +125,11 @@ class MainActivity : ComponentActivity() {`
`125`	`125`	`activityVisibleFlow.update { it + 1 }`
`126`	`126`	`}`
`127`	`127`
	`128`	`+ var isFirstResume = true`
`128`	`129`	`override fun onResume() {`
`129`	`130`	`super.onResume()`
`130`		`- if (startTime - app.startTime < 2000) {`
	`131`	`+ if (isFirstResume && startTime - app.startTime < 2000) {`
	`132`	`+ isFirstResume = false`
`131`	`133`	`return`
`132`	`134`	`}`
`133`	`135`	`syncFixState()`