[8.1.2+]

[media]
[收束tts]

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt

@@ -22,7 +22,6 @@ import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType
 import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType
 import com.mogo.och.common.module.manager.socket.lan.bean.TaskDetailsMsg
 import com.mogo.och.common.module.utils.ResourcesUtils
-import com.mogo.och.common.module.voice.VoiceNotice.showNotice
 import com.mogo.och.data.bean.BusRoutesResult
 import com.mogo.och.data.bean.BusTransferData
 import com.mogo.och.shuttle.weaknet.R

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/ShuttleVoiceManager.kt

@@ -7,7 +7,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.och.common.module.manager.socket.lan.LanSocketManager
 import com.mogo.och.common.module.manager.socket.lan.bean.AppConnectMsg
 import com.mogo.och.common.module.utils.ResourcesUtils
-import com.mogo.och.common.module.voice.VoiceNotice
+import com.mogo.och.common.module.biz.media.VoiceNotice
 import com.mogo.och.shuttle.weaknet.R
 import com.mogo.skin.utils.SkinResources
 import com.mogo.tts.base.LangTtsEntity

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

@@ -17,7 +17,7 @@ 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.MediaPlayerFragment
+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: MediaPlayerFragment? = null
+    private var mediaFragment: VideoPlayerFragment? = null
 
     // 视频直播流
     private val ochTransform = object : OchTransformDispatch {
@@ -99,7 +99,7 @@ class PM2BaseFragment :
         childFragmentManager.beginTransaction().add(R.id.hd_map_fragment, hdMapFragment!!)
             .show(hdMapFragment!!).commitAllowingStateLoss()
 
-        if (mediaFragment == null) mediaFragment = MediaPlayerFragment()
+        if (mediaFragment == null) mediaFragment = VideoPlayerFragment()
         childFragmentManager.beginTransaction().add(R.id.video_fragment, mediaFragment!!)
             .show(mediaFragment!!).commitAllowingStateLoss()
 

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

@@ -2,7 +2,6 @@ package com.mogo.och.shuttle.weaknet.passenger.ui.mind
 
 import android.util.Log
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
 import com.mogo.eagle.core.data.ai.V2XRepository
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
@@ -10,15 +9,12 @@ import com.mogo.och.shuttle.weaknet.passenger.ui.mind.bean.AIMessage
 import com.mogo.och.bridge.autopilot.location.OchLocationManager
 import com.mogo.och.common.module.biz.birdge.BridgeListener
 import com.mogo.och.common.module.biz.birdge.BridgeManager
-import com.mogo.och.common.module.voice.VoiceNotice
+import com.mogo.och.common.module.biz.media.VoiceNotice
 import com.mogo.och.shuttle.weaknet.passenger.callback.ICommonCallback
 import com.mogo.och.shuttle.weaknet.passenger.model.CommonModel
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharedFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.launch
 
 class MindViewModel : ViewModel(), AIMessageManager.AIMessageListener,
     BridgeListener {

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

@@ -9,9 +9,9 @@ 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.voice.OutOffVoice
 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
@@ -61,14 +61,14 @@ class ShuttlePassengerProvider : CommonServiceImpl() {
             }
         }
         TicketModel.load()
-        OutOffVoice.load()
+        MediaManager.Tts.loadOuttts()
         return mPM2Fragment!!
     }
 
     override fun resetFragment() {
         super.resetFragment()
         TicketModel.release()
-        OutOffVoice.release()
+        MediaManager.Tts.releaesOuttts()
         mPM2Fragment = null
     }
 

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

@@ -37,7 +37,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.voice.VoiceNotice.showNotice
 import com.mogo.och.common.module.wigets.media.MediaItem
 import com.mogo.och.data.bean.BusRoutesResult
 import com.mogo.och.data.bean.BusStationBean