From 2868eaea6d0929fcea86ccbe2920f9499c28267f Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 28 May 2024 12:00:27 +0800 Subject: [PATCH] =?UTF-8?q?[6.4.4]=20[=E7=AC=AC=E4=BA=8C=E5=B1=8F=E6=89=93?= =?UTF-8?q?=E5=BC=80=E9=9C=80=E8=A6=81=E6=98=AFeb5=E8=AE=BE=E5=A4=87]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/bus/passenger/BusPassengerProvider.kt | 3 ++- .../com/mogo/och/shuttle/passenger/ShuttlePassengerProvider.kt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/BusPassengerProvider.kt b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/BusPassengerProvider.kt index 21fdea40bc..5cef7b80d9 100644 --- a/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/BusPassengerProvider.kt +++ b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/BusPassengerProvider.kt @@ -9,6 +9,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.ActivityUtils +import com.mogo.eagle.core.utilcode.util.DeviceUtils import com.mogo.eagle.core.utilcode.util.MultiDisplayUtils import com.mogo.och.bus.passenger.passenger.ui.PM2BaseFragment import com.mogo.och.bus.passenger.passenger.ui.widget.M2StatusBarView @@ -31,7 +32,7 @@ class BusPassengerProvider : CommonServiceImpl() { private var mPM2Fragment: Fragment?=null override fun getFragment(): Fragment { - if (AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode)) { + if (AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode) && DeviceUtils.isEB5Model()) { MultiDisplayUtils.startActWithSecond(ActivityUtils.getTopActivity(), MediaPlayerActivity::class.java) } if(mPM2Fragment==null){ diff --git a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/ShuttlePassengerProvider.kt b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/ShuttlePassengerProvider.kt index 7a1a159cb6..3fbe34328f 100644 --- a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/ShuttlePassengerProvider.kt +++ b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/ShuttlePassengerProvider.kt @@ -7,6 +7,7 @@ import com.alibaba.android.arouter.facade.annotation.Route import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.util.ActivityUtils +import com.mogo.eagle.core.utilcode.util.DeviceUtils import com.mogo.eagle.core.utilcode.util.MultiDisplayUtils import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.biz.provider.CommonServiceImpl @@ -46,7 +47,7 @@ class ShuttlePassengerProvider : CommonServiceImpl() { } override fun getFragment(): Fragment { - if (AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode)) { + if (AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode) && DeviceUtils.isEB5Model()) { MultiDisplayUtils.startActWithSecond(ActivityUtils.getTopActivity(), MediaPlayerActivity::class.java) } if(mPM2Fragment==null){