[8.2.4][B2乘客]优化广告播放器使用的单例Key

OCH/common/biz/src/main/java/com/mogo/och/biz/media/AudioFocusManager.kt

@@ -55,19 +55,13 @@ object AudioFocusManager : MusicDataChangeListener {
                     }
                 }
                 if (isPlayingVideo) {
-                    CustomManager.getCustomManagersByTag(AdVideoPlayer.TAG).forEach{
+                    CustomManager.getNullableCustomManager(AdVideoPlayer.TAG)?.setNeedMute(true)
-                        it.setNeedMute(true)
-                    }
-//                    GSYVideoManager.instance().curPlayerManager?.setNeedMute(true)
                 }
             }else{
                 if(isPlayingMusic){
                     AuditionManager.setVolume(1f,1f)
                 }
-                CustomManager.getCustomManagersByTag(AdVideoPlayer.TAG).forEach{
+                CustomManager.getNullableCustomManager(AdVideoPlayer.TAG)?.setNeedMute(false)
-                    it.setNeedMute(false)
-                }
-//                GSYVideoManager.instance().curPlayerManager?.setNeedMute(false)
             }
         }
         CallerLogger.d(TAG, "setTTSFocusChange $isPlayingTTS--$isPlayingMusic---$isPlayingVideo")
@@ -84,17 +78,11 @@ object AudioFocusManager : MusicDataChangeListener {
                     AuditionManager.stop()
                 }
                 if (isPlayingTTS) {
-                    CustomManager.getCustomManagersByTag(AdVideoPlayer.TAG).forEach{
+                    CustomManager.getNullableCustomManager(AdVideoPlayer.TAG)?.setNeedMute(true)
-                        it.setNeedMute(true)
-                    }
-//                    GSYVideoManager.instance().curPlayerManager?.setNeedMute(true)
                 }
             } else {
                 if (!isPlayingTTS) {
-                    CustomManager.getCustomManagersByTag(AdVideoPlayer.TAG).forEach{
+                    CustomManager.getNullableCustomManager(AdVideoPlayer.TAG)?.setNeedMute(false)
-                        it.setNeedMute(false)
-                    }
-//                    GSYVideoManager.instance().curPlayerManager?.setNeedMute(false)
                 }
             }
         }

OCH/common/biz/src/main/java/com/mogo/och/biz/media/video/ads/AdVideoPlayer.kt

@@ -48,25 +48,14 @@ class AdVideoPlayer : StandardGSYVideoPlayer {
             }
     }
     override fun getGSYVideoManager(): GSYVideoViewBridge1 {
-        CustomManager.getCustomManager(key).initContext(context.applicationContext)
+        CustomManager.getCustomManager(TAG).initContext(context.applicationContext)
-        return CustomManager.getCustomManager(key)
+        return CustomManager.getCustomManager(TAG)
-    }
-
-    override fun backFromFull(context: Context): Boolean {
-        return CustomManager.backFromWindowFull(context, key)
     }
 
     override fun releaseVideos() {
-        CustomManager.releaseAllVideos(key)
+        CustomManager.releaseAllVideos(TAG)
     }
 
-    override fun getFullId(): Int {
-        return CustomManager.FULLSCREEN_ID
-    }
-
-    override fun getSmallId(): Int {
-        return CustomManager.SMALL_ID
-    }
     override fun hideAllWidget() {
         Logger.d(MediaLoopPlayView.TAG, "AdvanceGSYVideoPlayer，hideAllWidget")
     }
@@ -184,14 +173,4 @@ class AdVideoPlayer : StandardGSYVideoPlayer {
         }
     }
 
-    private val key: String
-        get() {
-            if (mPlayPosition == -22) {
-                Debuger.printfError(javaClass.simpleName + " used getKey() " + "******* PlayPosition never set. ********")
-            }
-            if (TextUtils.isEmpty(mPlayTag)) {
-                Debuger.printfError(javaClass.simpleName + " used getKey() " + "******* PlayTag never set. ********")
-            }
-            return TAG + mPlayPosition + mPlayTag
-        }
 }

core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/CustomManager.kt

@@ -120,17 +120,15 @@ class CustomManager : GSYVideoBaseManager() {
             }
             return customManager
         }
-        /**
+
-         * 获取所有指定tag对应的CustomManager
+
-         */
         @Synchronized
-        fun getCustomManagersByTag(tag: String): List<CustomManager> {
+        fun getNullableCustomManager(key: String?): CustomManager? {
-            if (tag.isBlank()) {
+            if (TextUtils.isEmpty(key)) {
-                return emptyList()
+                return null
             }
-            return sMap.filterKeys { key ->
+            val customManager: CustomManager? = sMap[key]
-                key.startsWith(tag)
+            return customManager
-            }.values.toList()
         }
 
         fun onPauseAll() {