From ea3b4397cebe8d531ff9f25e6c9a02ab8664fc4d Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 25 Jun 2025 16:57:48 +0800 Subject: [PATCH] =?UTF-8?q?[8.1.0]=20[fix]=20[t1t2]=20[=E6=92=AD=E6=94=BE?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=89=93=E6=96=AD=E9=9F=B3=E4=B9=90=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=20=E6=9A=82=E5=81=9C=E9=9F=B3=E4=B9=90]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/common/module/manager/EnvManager.kt | 4 ++-- .../module/manager/audiofocus/AudioFocusManager.kt | 7 ++++++- .../common/module/manager/audition/AuditionManager.kt | 9 +++++++++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/EnvManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/EnvManager.kt index 89089e568a..261ccbe987 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/EnvManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/EnvManager.kt @@ -17,7 +17,7 @@ object EnvManager { } fun isB2(): Boolean { - return AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode) + return AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) } fun isB2Driver(): Boolean { @@ -29,7 +29,7 @@ object EnvManager { } fun isT1T2(): Boolean { - return AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode) + return AppIdentityModeUtils.isT1T2(FunctionBuildConfig.appIdentityMode) } fun isT1T2Driver(): Boolean { diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/audiofocus/AudioFocusManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/audiofocus/AudioFocusManager.kt index d7c26644e9..a04cb103c2 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/audiofocus/AudioFocusManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/audiofocus/AudioFocusManager.kt @@ -4,6 +4,7 @@ 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.och.common.module.manager.EnvManager import com.mogo.och.common.module.manager.audition.AuditionManager import com.mogo.och.common.module.manager.audition.MusicData import com.mogo.och.common.module.manager.audition.PlayState @@ -64,7 +65,11 @@ object AudioFocusManager : AuditionManager.MusicDataChangeListener { if(isPlaying!= isPlayingVideo) { isPlayingVideo = isPlaying if(isPlaying){ - AuditionManager.stop() + if(EnvManager.isT1T2Passenger()){ + AuditionManager.pause() + }else { + AuditionManager.stop() + } } } } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/audition/AuditionManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/audition/AuditionManager.kt index 207561a4a7..c3feae4c51 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/audition/AuditionManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/audition/AuditionManager.kt @@ -64,6 +64,15 @@ object AuditionManager: AuditionCacheManager.DataChangeListener, Audition.OnAudi return Audition.isPlaying } + fun pause(){ + val playing = isPlaying() + if(playing){ + musicDataPlaying?.let { + toggle(it) + } + } + } + fun stop(){ val playing = isPlaying() if(playing){