优化ActivityManager,支持多屏Activity

Author: catchpig

CHANGE_lOG.md

@@ -1,4 +1,12 @@
 # CHANGE LOG
+### 1.5.6
+
++ 优化ActivityManager,支持多屏Activity
+
+### 1.5.5
+
++ 优化多屏启动activity方式
+
 ### 1.5.4
 
 + BaseVMDialogFragment增加lifecycle

mvvm/src/main/java/com/catchpig/mvvm/lifecycle/ActivityLifeCycleCallbacksImpl.kt

@@ -20,7 +20,7 @@ class ActivityLifeCycleCallbacksImpl : Application.ActivityLifecycleCallbacks {
 
     override fun onActivityStarted(activity: Activity) {
         "${activity::class.java.simpleName}->onStart".logd(TAG)
-        ActivityManager.addVisibleActivity()
+        ActivityManager.addVisibleActivity(activity)
     }
 
     override fun onActivityDestroyed(activity: Activity) {
@@ -34,7 +34,7 @@ class ActivityLifeCycleCallbacksImpl : Application.ActivityLifecycleCallbacks {
 
     override fun onActivityStopped(activity: Activity) {
         "${activity::class.java.simpleName}->onStop".logd(TAG)
-        ActivityManager.removeVisibleActivity()
+        ActivityManager.removeVisibleActivity(activity)
     }
 
     override fun onActivityCreated(activity: Activity, p1: Bundle?) {

mvvm/src/main/java/com/catchpig/mvvm/manager/ActivityManager.kt

@@ -1,101 +1,169 @@
 package com.catchpig.mvvm.manager
 
 import android.app.Activity
+import android.view.Display
+import com.catchpig.utils.ext.getDisplayId
 import com.catchpig.utils.ext.logi
-import java.util.LinkedList
 
 object ActivityManager {
     private const val TAG = "ActivityManager"
-    private var activities = LinkedList<Activity>()
-    private var visibleActivityCount = 0
-    private var isAppForeground: Boolean? = null
-
-    private val appStatusListeners = mutableListOf<OnAppStatusListener>()
+    private val displayActivities = mutableMapOf<Int, MutableList<Activity>>()
+    private val displayVisibleActivityCount = mutableMapOf<Int, Int>()
+    private val displayAppForeground = mutableMapOf<Int, Boolean>()
+    private val displayAppStatusListener = mutableMapOf<Int, MutableList<OnAppStatusListener>>()
 
     fun addAppStatusListener(listener: OnAppStatusListener) {
+        addAppStatusListener(Display.DEFAULT_DISPLAY, listener)
+    }
+
+    fun addAppStatusListener(displayId: Int, listener: OnAppStatusListener) {
+        val appStatusListeners = getAppStatusListeners(displayId)
         if (appStatusListeners.contains(listener)) {
-            "addAppStatusListener->listener:$listener has already been added"
+            "addAppStatusListener->listener:$listener has already been added".logi(TAG)
             return
         }
         appStatusListeners.add(listener)
     }
 
     fun removeAppStatusListener(listener: OnAppStatusListener) {
+        removeAppStatusListener(Display.DEFAULT_DISPLAY, listener)
+    }
+
+    fun removeAppStatusListener(displayId: Int, listener: OnAppStatusListener) {
+        val appStatusListeners = getAppStatusListeners(displayId)
         appStatusListeners.remove(listener)
     }
 
+    private fun getAppStatusListeners(displayId: Int): MutableList<OnAppStatusListener> {
+        if (displayAppStatusListener.containsKey(displayId)) {
+            return displayAppStatusListener[displayId]!!
+        }
+        return mutableListOf()
+    }
+
     /**
-     * t
+     *
      */
-    fun addVisibleActivity() {
+    fun addVisibleActivity(activity: Activity) {
+        val displayId = activity.getDisplayId()
+        var visibleActivityCount = getVisibleActivityCount(displayId)
         visibleActivityCount++
-        notifyAppStatus()
+        displayVisibleActivityCount[displayId] = visibleActivityCount
+        notifyAppStatus(displayId)
     }
 
-    fun removeVisibleActivity() {
+    fun removeVisibleActivity(activity: Activity) {
+        val displayId = activity.getDisplayId()
+        var visibleActivityCount = getVisibleActivityCount(displayId)
         visibleActivityCount--
-        notifyAppStatus()
+        displayVisibleActivityCount[displayId] = visibleActivityCount
+        notifyAppStatus(displayId)
+    }
+
+    private fun getVisibleActivityCount(displayId: Int): Int {
+        return displayVisibleActivityCount[displayId] ?: 0
     }
 
     /**
      * 应用是否在前台
      */
-    fun isForeground(): Boolean {
+    fun isForeground(displayId: Int): Boolean {
+        val visibleActivityCount = getVisibleActivityCount(displayId)
         return visibleActivityCount > 0
     }
 
     /**
      * 通知应用前后台状态
      */
-    private fun notifyAppStatus() {
-        val isForeground = isForeground()
-        if (isForeground == isAppForeground) {
+    private fun notifyAppStatus(displayId: Int) {
+        val currentAppForeground = isForeground(displayId)
+        val lastAppForeground = displayAppForeground[displayId] ?: false
+        if (currentAppForeground == lastAppForeground) {
             return
         }
-        "notifyAppStatus->isForeground:$isForeground,isAppForeground:$isAppForeground".logi(TAG)
-        isAppForeground = isForeground
+        "notifyAppStatus->displayId:${displayId},currentAppForeground:$currentAppForeground,lastAppForeground:$lastAppForeground".logi(
+            TAG
+        )
+        displayAppForeground[displayId] = currentAppForeground
+        val appStatusListeners = getAppStatusListeners(displayId)
         appStatusListeners.forEach {
-            if (isForeground) {
-                it.onForeground()
+            if (currentAppForeground) {
+                it.onForeground(displayId)
             } else {
-                it.onBackground()
+                it.onBackground(displayId)
             }
         }
     }
 
+    private fun getActivities(displayId: Int): MutableList<Activity> {
+        if (displayActivities.containsKey(displayId)) {
+            return displayActivities[displayId]!!
+        }
+        return mutableListOf()
+    }
+
     /**
      * 添加activity
      */
     fun addActivity(activity: Activity) {
+        val activities = getActivities(activity.getDisplayId())
         activities.add(activity)
     }
 
     /**
      * 删除activity
      */
-    fun removeActivity(activity: Activity?) {
+    fun removeActivity(activity: Activity) {
+        val activities = getActivities(activity.getDisplayId())
         activities.remove(activity)
     }
 
     /**
      * 获取最顶层的activity
      */
     fun getTopActivity(): Activity {
+        return getTopActivity(Display.DEFAULT_DISPLAY)
+    }
+
+    /**
+     * 获取最顶层的activity
+     * @param displayId
+     */
+    fun getTopActivity(displayId: Int): Activity {
+        val activities = getActivities(displayId)
         return activities.last()
     }
 
     /**
      * 获取第一个Activity
      */
     fun getFirstActivity(): Activity {
-        return activities.first
+        return getFirstActivity(Display.DEFAULT_DISPLAY)
+    }
+
+    /**
+     * 获取第一个Activity
+     * @param displayId
+     */
+    fun getFirstActivity(displayId: Int): Activity {
+        val activities = getActivities(displayId)
+        return activities.first()
     }
 
     /**
      * 删除除最上层之外的所有activity
      */
     fun finishAllActivitiesExceptTop() {
-        val topActivity = getTopActivity()
+        finishAllActivitiesExceptTop(Display.DEFAULT_DISPLAY)
+    }
+
+    /**
+     * 删除除最上层之外的所有activity
+     * @param displayId
+     */
+    fun finishAllActivitiesExceptTop(displayId: Int) {
+        val topActivity = getTopActivity(displayId)
+        val activities = getActivities(displayId)
         val iterator = activities.iterator()
         while (iterator.hasNext()) {
             val activity = iterator.next()
@@ -109,6 +177,17 @@ object ActivityManager {
      * 删除所有的activity
      */
     fun finishAllActivities() {
+        for (displayId in displayActivities.keys) {
+            finishAllActivities(displayId)
+        }
+    }
+
+    /**
+     * 删除所有的activity
+     * @param displayId
+     */
+    fun finishAllActivities(displayId: Int) {
+        val activities = getActivities(displayId)
         val iterator = activities.iterator()
         while (iterator.hasNext()) {
             val activity = iterator.next()
@@ -121,11 +200,11 @@ object ActivityManager {
         /**
          * 前台
          */
-        fun onForeground()
+        fun onForeground(displayId: Int)
 
         /**
          * 后台
          */
-        fun onBackground()
+        fun onBackground(displayId: Int)
     }
 }

utils/src/main/java/com/catchpig/utils/ext/ContextExt.kt

@@ -7,6 +7,7 @@ import android.content.Intent
 import android.hardware.display.DisplayManager
 import android.net.Uri
 import android.os.Build
+import android.view.Display
 import android.view.LayoutInflater
 import androidx.annotation.ColorInt
 import androidx.annotation.ColorRes
@@ -16,6 +17,14 @@ import java.io.File
 
 private const val TAG = "ContextExt"
 
+fun Context.getDisplayId(): Int {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+        display.displayId
+    } else {
+        Display.DEFAULT_DISPLAY
+    }
+}
+
 /**
  * 根据屏幕Id创建上下文
  * @receiver Context