perf: 优化应用市场模式标记更新后的数据传递

DUpdateSystem · Jul 28, 2020 · 7bf5817 · 7bf5817
1 parent e3b3fcc
commit 7bf5817
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,7 +26,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 29
         versionCode 45
-        versionName "0.1.2-rc.1"
+        versionName "0.1.2-rc.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/src/main/java/net/xzos/upgradeall/data/AppUiDataManager.kt b/app/src/main/java/net/xzos/upgradeall/data/AppUiDataManager.kt
@@ -29,6 +29,8 @@ object AppUiDataManager {
     // 列表中所有的 APP
     private val appListLiveDataMap: MutableMap<Int, MutableLiveData<List<BaseApp>>> = mutableMapOf()
 
+    private val applicationObserverFunMap: MutableMap<Applications, ObserverFun<Unit>> = mutableMapOf()
+
     init {
         AppManager.observeForever<Unit>(fun(_) {
             refreshAllAppListMap()
@@ -54,9 +56,32 @@ object AppUiDataManager {
                 }
             }
         }
+        setApplicationObserverMap(needUpdateAppList.filterIsInstance<Applications>())
         needUpdateAppListLiveData.setValueBackground(list)
     }
 
+    private fun setApplicationObserverMap(newList: List<Applications>) {
+        val oldList = applicationObserverFunMap.keys.toList()
+        if (oldList == newList) return
+        val delList = oldList.filter {
+            !newList.contains(it)
+        }
+        for (applications in delList) {
+            applications.removeObserver(applicationObserverFunMap.remove(applications)!!)
+        }
+        val addList = newList.filter {
+            !oldList.contains(it)
+        }
+        for (applications in addList) {
+            val observerFun = fun(_: Unit) {
+                refreshNeedUpdateAppList()
+            }.also {
+                applicationObserverFunMap[applications] = it
+            }
+            applications.observeForever(observerFun)
+        }
+    }
+
     private fun refreshAllAppListMap() {
         allAppListLiveData.setValueBackground(AppManager.apps)
     }

diff --git a/core/src/main/java/net/xzos/upgradeall/core/oberver/Informer.kt b/core/src/main/java/net/xzos/upgradeall/core/oberver/Informer.kt
@@ -10,6 +10,10 @@ private const val DEFAULT_TAG = "NULL"
 
 interface Informer {
 
+    fun notifyChanged() {
+        notifyChanged(DEFAULT_TAG, Unit)
+    }
+
     fun notifyChanged(tag: String) {
         notifyChanged(tag, Unit)
     }

diff --git a/core/src/main/java/net/xzos/upgradeall/core/server_manager/AppManager.kt b/core/src/main/java/net/xzos/upgradeall/core/server_manager/AppManager.kt
@@ -22,7 +22,7 @@ object AppManager : Informer {
     }
 
     private fun notifyChange() {
-        notifyChanged(Unit)
+        notifyChanged()
     }
 
     private fun initApp() {

diff --git a/...src/main/java/net/xzos/upgradeall/core/server_manager/module/applications/Applications.kt b/...src/main/java/net/xzos/upgradeall/core/server_manager/module/applications/Applications.kt
@@ -31,13 +31,13 @@ class Applications(override val appDatabase: AppDatabase,
         if (appStatus == Updater.INVALID_APP && app is App) {
             markInvalidApp(app)
         }
-        notifyChanged(Unit)  // 通知应用列表改变
+        notifyChanged()  // 通知应用列表改变
         checkUpdateStatusChanged()
     })
     private val otherUpdateControl = UpdateControl(applicationsUtils.excludeApps, fun(app, appStatus) {
         if ((appStatus == Updater.APP_OUTDATED || appStatus == Updater.APP_LATEST) && app is App) {
             markValidApp(app)
-            notifyChanged(Unit)
+            notifyChanged()
         }
         checkUpdateStatusChanged()
     })