From 949d06a841f5ea264d054eb305bfc00646c5e6e0 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Thu, 4 Sep 2025 18:45:05 +0800 Subject: [PATCH] =?UTF-8?q?[8.2.2][fix]=E4=B9=98=E5=AE=A2=E5=B1=8F?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=A0=E5=B9=BF=E5=91=8A=E6=92=AD=E6=94=BE?= =?UTF-8?q?=E5=99=A8=E5=A4=9A=E5=AE=9E=E4=BE=8B=E5=BC=95=E8=B5=B7=E7=9A=84?= =?UTF-8?q?tts=E6=92=AD=E6=8A=A5=E6=97=B6=E8=A7=86=E9=A2=91=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E9=9D=99=E9=9F=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/biz/media/AudioFocusManager.kt | 22 +++++++++++++++---- .../och/biz/media/video/ads/AdVideoPlayer.kt | 2 +- .../core/widget/media/video/CustomManager.kt | 12 ++++++++++ 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/media/AudioFocusManager.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/media/AudioFocusManager.kt index c5537ebfc9..fadae2a386 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/media/AudioFocusManager.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/media/AudioFocusManager.kt @@ -4,8 +4,10 @@ import android.content.Context import android.media.AudioManager import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.widget.media.video.CustomManager import com.mogo.och.common.module.manager.EnvManager import com.mogo.och.biz.media.audition.AuditionManager +import com.mogo.och.biz.media.video.ads.AdVideoPlayer import com.mogo.och.common.module.biz.media.MusicDataChangeListener import com.mogo.och.common.module.biz.media.data.MusicData import com.mogo.och.common.module.biz.media.data.PlayState @@ -53,13 +55,19 @@ object AudioFocusManager : MusicDataChangeListener { } } if (isPlayingVideo) { - GSYVideoManager.instance().curPlayerManager?.setNeedMute(true) + CustomManager.getCustomManagersByTag(AdVideoPlayer.TAG).forEach{ + it.setNeedMute(true) + } +// GSYVideoManager.instance().curPlayerManager?.setNeedMute(true) } }else{ if(isPlayingMusic){ AuditionManager.setVolume(1f,1f) } - GSYVideoManager.instance().curPlayerManager?.setNeedMute(false) + CustomManager.getCustomManagersByTag(AdVideoPlayer.TAG).forEach{ + it.setNeedMute(false) + } +// GSYVideoManager.instance().curPlayerManager?.setNeedMute(false) } } CallerLogger.d(TAG, "setTTSFocusChange $isPlayingTTS--$isPlayingMusic---$isPlayingVideo") @@ -76,11 +84,17 @@ object AudioFocusManager : MusicDataChangeListener { AuditionManager.stop() } if (isPlayingTTS) { - GSYVideoManager.instance().curPlayerManager?.setNeedMute(true) + CustomManager.getCustomManagersByTag(AdVideoPlayer.TAG).forEach{ + it.setNeedMute(true) + } +// GSYVideoManager.instance().curPlayerManager?.setNeedMute(true) } } else { if (!isPlayingTTS) { - GSYVideoManager.instance().curPlayerManager?.setNeedMute(false) + CustomManager.getCustomManagersByTag(AdVideoPlayer.TAG).forEach{ + it.setNeedMute(false) + } +// GSYVideoManager.instance().curPlayerManager?.setNeedMute(false) } } } diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/media/video/ads/AdVideoPlayer.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/media/video/ads/AdVideoPlayer.kt index cad47d9aa2..77de76c6e2 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/media/video/ads/AdVideoPlayer.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/media/video/ads/AdVideoPlayer.kt @@ -18,7 +18,7 @@ import com.shuyu.gsyvideoplayer.video.base.GSYVideoViewBridge as GSYVideoViewBri class AdVideoPlayer : StandardGSYVideoPlayer { companion object { - private const val TAG = "AdVideoPlayer" + const val TAG = "AdVideoPlayer" } constructor(context: Context?) : super(context) constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs) diff --git a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/CustomManager.kt b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/CustomManager.kt index 7a0a6ae14e..5fb443f787 100644 --- a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/CustomManager.kt +++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/CustomManager.kt @@ -120,6 +120,18 @@ class CustomManager : GSYVideoBaseManager() { } return customManager } + /** + * 获取所有指定tag对应的CustomManager + */ + @Synchronized + fun getCustomManagersByTag(tag: String): List { + if (tag.isBlank()) { + return emptyList() + } + return sMap.filterKeys { key -> + key.startsWith(tag) + }.values.toList() + } fun onPauseAll() { if (sMap.isNotEmpty()) {