[8.1.2+]

[media]
[video 收束]

OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2BaseFragment.kt

@@ -3,6 +3,7 @@ package com.mogo.och.shuttle.weaknet.passenger.ui
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
+import androidx.fragment.app.Fragment
 import com.mogo.commons.mvp.MvpFragment
 import com.mogo.eagle.core.data.enums.EventTypeEnumNew
 import com.mogo.eagle.core.function.call.hmi.CallerRoadV2NEventWindowListenerManager
@@ -17,7 +18,6 @@ import com.mogo.och.common.module.manager.transform.OchTransform
 import com.mogo.och.common.module.manager.transform.OchTransformDispatch
 import com.mogo.och.shuttle.weaknet.passenger.R
 import com.mogo.och.shuttle.weaknet.passenger.presenter.PM2Presenter
-import com.mogo.och.common.module.wigets.media.VideoPlayerFragment
 import com.mogo.och.shuttle.weaknet.passenger.ui.line.PM2DrivingInfoFragment
 import com.mogo.och.shuttle.weaknet.passenger.ui.map.PM2HPMapFragment
 import com.mogo.och.shuttle.weaknet.passenger.ui.mind.AIMessageManager
@@ -40,7 +40,7 @@ class PM2BaseFragment :
 
     private var drivingFragment: PM2DrivingInfoFragment? = null
     private var hdMapFragment: PM2HPMapFragment? = null
-    private var mediaFragment: VideoPlayerFragment? = null
+    private var mediaFragment: Fragment? = null
 
     // 视频直播流
     private val ochTransform = object : OchTransformDispatch {
@@ -99,7 +99,9 @@ class PM2BaseFragment :
         childFragmentManager.beginTransaction().add(R.id.hd_map_fragment, hdMapFragment!!)
             .show(hdMapFragment!!).commitAllowingStateLoss()
 
-        if (mediaFragment == null) mediaFragment = VideoPlayerFragment()
+        if (mediaFragment == null) {
+            mediaFragment = MediaManager.Video.getAdFragment()
+        }
         childFragmentManager.beginTransaction().add(R.id.video_fragment, mediaFragment!!)
             .show(mediaFragment!!).commitAllowingStateLoss()
 

OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/ShuttlePassengerProvider.kt

@@ -6,13 +6,10 @@ import androidx.fragment.app.Fragment
 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.biz.media.MediaManager
 import com.mogo.och.common.module.constant.OchCommonConst
 import com.mogo.och.common.module.biz.provider.CommonServiceImpl
-import com.mogo.och.common.module.wigets.media.MediaPlayerActivity
 import com.mogo.och.shuttle.weaknet.passenger.model.TicketModel
 import com.mogo.och.shuttle.weaknet.passenger.ui.widget.BusPStatusBarView
 import com.mogo.och.shuttle.weaknet.passenger.ui.BusPassengerRouteFragment
@@ -49,7 +46,7 @@ class ShuttlePassengerProvider : CommonServiceImpl() {
 
     override fun getFragment(): Fragment {
         if (AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode) && DeviceUtils.isEB5Model()) {
-            MultiDisplayUtils.startActWithSecond(ActivityUtils.getTopActivity(), MediaPlayerActivity::class.java)
+           MediaManager.Video.startSecondAds()
         }
         if(mPM2Fragment==null){
             mPM2Fragment = if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)) {

OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/CommonModel.kt

@@ -25,6 +25,7 @@ import com.mogo.och.bridge.autopilot.location.OchLocationManager
 import com.mogo.och.bridge.distance.IDistanceListener
 import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager
 import com.mogo.och.common.module.biz.birdge.BridgeManager
+import com.mogo.och.common.module.biz.media.data.MediaItem
 import com.mogo.och.common.module.constant.OchCommonConst
 import com.mogo.och.common.module.manager.download.DownloadManager
 import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager
@@ -37,7 +38,6 @@ import com.mogo.och.common.module.manager.socket.lan.bean.TaskDetailsMsg
 import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.common.module.utils.DateTimeUtil
 import com.mogo.och.common.module.utils.PinYinUtil
-import com.mogo.och.common.module.wigets.media.MediaItem
 import com.mogo.och.data.bean.BusRoutesResult
 import com.mogo.och.data.bean.BusStationBean
 import com.mogo.och.data.bean.BusTransferData