perf: skip self app activity log in background

gkd-kit · Aug 4, 2024 · a3d8a07 · a3d8a07
1 parent 2644c0b
commit a3d8a07
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/app/src/main/kotlin/li/songe/gkd/MainActivity.kt b/app/src/main/kotlin/li/songe/gkd/MainActivity.kt
@@ -16,6 +16,8 @@ import com.dylanc.activityresult.launcher.StartActivityLauncher
 import com.ramcosta.composedestinations.DestinationsNavHost
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import li.songe.gkd.composition.CompositionActivity
 import li.songe.gkd.composition.CompositionExt.useLifeCycleLog
@@ -103,8 +105,21 @@ class MainActivity : CompositionActivity({
             updateServiceRunning()
         }
     }
+
+    override fun onStart() {
+        super.onStart()
+        activityVisibleFlow.update { it + 1 }
+    }
+
+    override fun onStop() {
+        super.onStop()
+        activityVisibleFlow.update { it - 1 }
+    }
 }
 
+private val activityVisibleFlow by lazy { MutableStateFlow(0) }
+fun isActivityVisible() = activityVisibleFlow.value > 0
+
 fun Activity.navToMainActivity() {
     val intent = this.intent?.cloneFilter()
     if (intent != null) {
@@ -116,6 +131,7 @@ fun Activity.navToMainActivity() {
     finish()
 }
 
+
 private fun updateServiceRunning() {
     ManageService.isRunning.value = ServiceUtils.isServiceRunning(ManageService::class.java)
     GkdAbService.isRunning.value = ServiceUtils.isServiceRunning(GkdAbService::class.java)

diff --git a/app/src/main/kotlin/li/songe/gkd/service/AbState.kt b/app/src/main/kotlin/li/songe/gkd/service/AbState.kt
@@ -5,6 +5,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import li.songe.gkd.BuildConfig
 import li.songe.gkd.app
 import li.songe.gkd.appScope
 import li.songe.gkd.data.ActivityLog
@@ -14,6 +15,7 @@ import li.songe.gkd.data.GlobalRule
 import li.songe.gkd.data.ResolvedRule
 import li.songe.gkd.data.SubsConfig
 import li.songe.gkd.db.DbSet
+import li.songe.gkd.isActivityVisible
 import li.songe.gkd.util.RuleSummary
 import li.songe.gkd.util.getDefaultLauncherAppId
 import li.songe.gkd.util.increaseClickCount
@@ -37,7 +39,12 @@ private val activityLogMutex by lazy { Mutex() }
 private var activityLogCount = 0
 private var lastActivityChangeTime = 0L
 fun updateTopActivity(topActivity: TopActivity) {
-    if (topActivityFlow.value.appId == topActivity.appId && topActivityFlow.value.activityId == topActivity.activityId) {
+    val isSameActivity =
+        topActivityFlow.value.appId == topActivity.appId && topActivityFlow.value.activityId == topActivity.activityId
+    if (isSameActivity) {
+        if (isActivityVisible() && topActivity.appId == BuildConfig.APPLICATION_ID) {
+            return
+        }
         if (topActivityFlow.value.number == topActivity.number) {
             return
         }