[8.1.2+]

[media] [收束tts]
2025-07-22 10:52:09 +08:00
parent b6b4c21327
commit 0741ba8e99
37 changed files with 206 additions and 131 deletions
--- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
+++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
@@ -1,7 +1,6 @@
 package com.magic.mogo.och.charter.model

 import android.content.Context
-import android.net.ConnectivityManager
 import com.alibaba.android.arouter.utils.TextUtils
 import com.amap.api.maps.model.LatLng
 import com.elegant.network.utils.GsonUtil
@@ -13,8 +12,6 @@ import com.magic.mogo.och.charter.callback.IDriverM1ControllerStatusCallback
 import com.magic.mogo.och.charter.constant.CharterConst
 import com.magic.mogo.och.charter.manager.CharterTrajectoryManager
 import com.magic.mogo.och.charter.net.DriverM1ServiceManager
-import com.mogo.commons.module.intent.IMogoIntentListener
-import com.mogo.commons.module.intent.IntentManager
 import com.mogo.commons.voice.AIAssist
 import com.mogo.eagle.core.data.BaseData
 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
@@ -66,7 +63,7 @@ import com.mogo.och.common.module.manager.socket.lan.bean.DPOrderClosedMsg
 import com.mogo.och.common.module.manager.stopside.StopSideManager
 import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.common.module.utils.*
-import com.mogo.och.common.module.voice.VoiceNotice
+import com.mogo.och.common.module.biz.media.VoiceNotice
 import com.mogo.och.data.bean.LineInfo

 /**
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt
@@ -55,7 +55,7 @@ import com.mogo.och.common.module.biz.birdge.BridgeManager
 import com.mogo.och.common.module.constant.OchCommonConst
 import com.mogo.och.common.module.utils.DateTimeUtil
 import com.mogo.och.common.module.utils.PinYinUtil
-import com.mogo.och.common.module.voice.VoiceNotice
+import com.mogo.och.common.module.biz.media.VoiceNotice
 import io.reactivex.Observable
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/presenter/BusPassengerPresenter.kt
@@ -39,7 +39,7 @@ import com.mogo.och.bridge.device.callback.LightAirconditionDoorCallback
 import com.mogo.och.common.module.manager.stopside.OCHPlanningActionsCallback
 import com.mogo.och.common.module.manager.stopside.StopSideStatus
 import com.mogo.och.bridge.utils.CoordinateCalculateRouteUtil
-import com.mogo.och.common.module.voice.VoiceNotice
+import com.mogo.och.common.module.biz.media.VoiceNotice
 import com.mogo.och.common.module.wigets.toast.ToastCharterUtils
 import me.jessyan.autosize.utils.AutoSizeUtils
 import java.util.concurrent.ConcurrentHashMap
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/receive/DriverMessage.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/receive/DriverMessage.kt
@@ -1,6 +1,5 @@
 package com.mogo.och.charter.passenger.receive

-import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.voice.AIAssist
 import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
@@ -21,7 +20,7 @@ import com.mogo.och.common.module.manager.socket.lan.bean.ChangeDestMsg
 import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType
 import com.mogo.och.common.module.utils.DateTimeUtil
 import com.mogo.och.common.module.utils.SoundPoolHelper
-import com.mogo.och.common.module.voice.VoiceNotice
+import com.mogo.och.common.module.biz.media.VoiceNotice
 import com.mogo.skin.utils.SkinResources

 object DriverMessage: IReceivedMsgListener {
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/dialogfragment/NoviceGuidanceFragment.kt
@@ -20,7 +20,7 @@ import com.mogo.och.charter.passenger.R
 import com.mogo.och.charter.passenger.model.CharterPassengerModel
 import com.mogo.och.charter.passenger.presenter.BusPassengerPresenter
 import com.mogo.och.charter.passenger.presenter.CharterPassengerNoviceGuidancePresenter
-import com.mogo.och.common.module.voice.VoiceNotice
+import com.mogo.och.common.module.biz.media.VoiceNotice
 import com.mogo.skin.utils.SkinResources
 import kotlinx.android.synthetic.main.charter_p_novice_guidance_fragment.include_welcome
 import kotlinx.android.synthetic.main.charter_p_novice_guidance_fragment.include_welcome_01
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/CharterVoiceManager.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/utils/CharterVoiceManager.kt
@@ -3,7 +3,7 @@ package com.mogo.och.charter.passenger.utils
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.voice.AIAssist
 import com.mogo.och.charter.passenger.R
-import com.mogo.och.common.module.voice.VoiceNotice
+import com.mogo.och.common.module.biz.media.VoiceNotice
 import com.mogo.skin.utils.SkinResources
 import com.mogo.tts.base.IMogoTTSCallback
 import com.mogo.tts.base.LangTtsEntity
--- a/OCH/common/biz/src/main/java/com/mogo/och/biz/media/MediaProvider.kt
+++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/media/MediaProvider.kt
@@ -5,19 +5,23 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.mogo.eagle.core.function.call.base.CallerBase
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OCHCOMMON
 import com.mogo.och.biz.media.audition.AuditionManager
-import com.mogo.och.common.module.biz.media.IMediaListener
+import com.mogo.och.biz.media.tts.VoiceIn
+import com.mogo.och.biz.media.tts.VoiceOut
+import com.mogo.och.common.module.biz.media.IVideoListener
 import com.mogo.och.common.module.biz.media.MediaService
 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.constant.OchCommonConst
 import com.mogo.och.common.module.wigets.media.MediaItem
+import com.mogo.tts.base.IMogoTTSCallback
+import com.mogo.tts.base.LangTtsEntity


 /**
 * eye 桥
 */
@Route(path = OchCommonConst.BIZ_Media)
-class MediaProvider : MediaService, CallerBase<IMediaListener>() {
+class MediaProvider : MediaService, CallerBase<IVideoListener>() {

    private var context: Context? = null

@@ -27,11 +31,11 @@ class MediaProvider : MediaService, CallerBase<IMediaListener>() {
        this.context = context
    }

-    override fun addMediaListener(tag: String, listener: IMediaListener) {
+    override fun addVideoListener(tag: String, listener: IVideoListener) {
        addListener(tag, listener)
    }

-    override fun removeBridgeListener(tag: String) {
+    override fun removeVideoListener(tag: String) {
        removeListener(tag)
    }

@@ -111,5 +115,37 @@ class MediaProvider : MediaService, CallerBase<IMediaListener>() {
        return AuditionManager.musicList
    }

+    override fun showNotice(
+        notice: String?,
+        level: Int,
+        delayed: Long,
+        callBack: IMogoTTSCallback?
+    ) {
+        VoiceIn.showNotice(notice,level,delayed,callBack)
+    }
+
+    override fun showNotice(
+        listTTS: MutableList<LangTtsEntity>,
+        level: Int,
+        callBack: IMogoTTSCallback?
+    ) {
+        VoiceIn.showNotice(listTTS,level,callBack)
+    }
+
+    override fun showNoticeOut(notice: String?) {
+        VoiceOut.showNoticeOut(notice)
+    }
+
+    override fun stopTTs() {
+        VoiceIn.stopCurrentTts()
+    }
+
+    override fun loadOuttts() {
+        VoiceOut.load()
+    }
+
+    override fun releaseOuttts() {
+        VoiceOut.release()
+    }

 }
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/voice/VoiceNotice.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/voice/VoiceNotice.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.common.module.voice
+package com.mogo.och.biz.media.tts

 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.voice.AIAssist
@@ -14,43 +14,11 @@ import com.mogo.tts.base.LangTtsEntity
 import com.mogo.tts.base.LanguageType
 import com.mogo.tts.base.MultiLangTtsEntity

-object VoiceNotice {
+object VoiceIn {

    const val onlyChinese = 1 //中文
    const val chineseEnglishKorean = 1 shl 1 // 左移一位 中英韩

-    @JvmStatic
-    fun showNotice(notice: String?) {
-        showNotice(notice, AIAssist.LEVEL0)
-    }
-
-    @JvmStatic
-    fun showNoticeOut(notice: String?) {
-        save2Log("车外准备播放 内容${notice}")
-        notice?.let {
-            if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
-                val outofVoice = OutofVoice(notice)
-                LanSocketManager.sendMsgToClient(outofVoice)
-            }else{
-                AIAssist.getInstance(AbsMogoApplication.getApp()).playVoiceOutside(notice)
-            }
-        }
-    }
-
-    @JvmStatic
-    fun showNotice(notice: String?, level: Int) {
-        showNotice(notice,level,0)
-    }
-
-    @JvmStatic
-    fun showNotice(notice: String?, delayed: Long) {
-        showNotice(notice, AIAssist.LEVEL0, delayed)
-    }
-
-    @JvmStatic
-    fun showNotice(notice: String?, delayed: Long,callback:IMogoTTSCallback ) {
-        showNotice(notice, AIAssist.LEVEL0, delayed,callback)
-    }


    @JvmStatic
@@ -99,12 +67,6 @@ object VoiceNotice {
    }


-    fun speakTTSVoiceWithLevel(text:String, level:Int, callBack:IMogoTTSCallback){
-        save2Log("准备播放${text}")
-        AIAssist.getInstance(AbsMogoApplication.getApp()).speakTTSVoiceWithLevel(text,level,callCallBack(callBack))
-    }
-
-


    private fun callCallBack(callBack: IMogoTTSCallback?):IMogoTTSCallback{
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/voice/OutOffVoice.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/voice/OutOffVoice.kt
@@ -1,14 +1,29 @@
-package com.mogo.och.common.module.voice
+package com.mogo.och.biz.media.tts

 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.voice.AIAssist
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.common.module.manager.socket.lan.ILanMessageListener
 import com.mogo.och.common.module.manager.socket.lan.LanSocketManager
 import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType
 import com.mogo.och.common.module.manager.socket.lan.bean.OutofVoice

-object OutOffVoice {
+object VoiceOut {
+
+    @JvmStatic
+    fun showNoticeOut(notice: String?) {
+        VoiceIn.save2Log("车外准备播放 内容${notice}")
+        notice?.let {
+            if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
+                val outofVoice = OutofVoice(notice)
+                LanSocketManager.sendMsgToClient(outofVoice)
+            }else{
+                AIAssist.getInstance(AbsMogoApplication.getApp()).playVoiceOutside(notice)
+            }
+        }
+    }

    val outffListener = object : ILanMessageListener<OutofVoice> {
        override fun targetLan(): Class<OutofVoice> {
--- a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/line/LineManager.kt
+++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/line/LineManager.kt
@@ -31,7 +31,7 @@ import com.mogo.och.bridge.autopilot.location.OchLocationManager
 import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.common.module.utils.CallerBase
-import com.mogo.och.common.module.voice.VoiceNotice
+import com.mogo.och.common.module.biz.media.VoiceNotice
 import com.mogo.och.data.bean.BusStationBean
 import com.mogo.och.data.bean.ContraiInfo
 import com.mogo.och.data.bean.LineInfo
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/media/IVideoListener.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/media/IVideoListener.kt
@@ -3,7 +3,8 @@ package com.mogo.och.common.module.biz.media
 import com.mogo.och.common.module.biz.media.data.MusicData
 import com.mogo.och.common.module.wigets.media.MediaItem

-interface IMediaListener {
+interface IVideoListener {
+
    fun diapatchMedia(list :MutableList<MediaItem>)

    fun setMediaPause(){}
@@ -13,6 +14,7 @@ interface IMediaListener {
 }

 interface MusicDataChangeListener{
+
    fun addOneData(it: MusicData){}

    /**
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/media/MediaManager.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/media/MediaManager.kt
@@ -4,18 +4,20 @@ import com.alibaba.android.arouter.launcher.ARouter
 import com.mogo.och.common.module.biz.media.data.MusicData
 import com.mogo.och.common.module.constant.OchCommonConst
 import com.mogo.och.common.module.wigets.media.MediaItem
+import com.mogo.tts.base.IMogoTTSCallback
+import com.mogo.tts.base.LangTtsEntity

 object MediaManager {

    private var mediaService: MediaService? =
        ARouter.getInstance().build(OchCommonConst.BIZ_Media).navigation() as MediaService

-    fun addListener(tag:String, listener: IMediaListener){
-        mediaService?.addMediaListener(tag,listener)
+    fun addListener(tag:String, listener: IVideoListener){
+        mediaService?.addVideoListener(tag,listener)
    }

    fun removeListener(tag: String){
-        mediaService?.removeBridgeListener(tag)
+        mediaService?.removeVideoListener(tag)
    }

    fun postSiteIntroduceInfo(list: MutableList<MediaItem>){
@@ -89,4 +91,31 @@ object MediaManager {

    }

+    object Tts{
+
+        fun loadOuttts(){
+            mediaService?.loadOuttts()
+        }
+
+        fun releaesOuttts(){
+            mediaService?.releaseOuttts()
+        }
+
+        fun showNotice(notice: String?, level: Int, delayed: Long = 0,callBack: IMogoTTSCallback?=null){
+            mediaService?.showNotice(notice,level,delayed,callBack)
+        }
+
+        fun showNotice(listTTS: MutableList<LangTtsEntity>, level: Int, callBack: IMogoTTSCallback?=null){
+            mediaService?.showNotice(listTTS,level,callBack)
+        }
+
+        fun stopTts(){
+            mediaService?.stopTTs()
+        }
+
+        fun showNoticeOut(notice: String?) {
+            mediaService?.showNoticeOut(notice)
+        }
+    }
+
 }
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/media/MediaService.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/media/MediaService.kt
@@ -3,12 +3,14 @@ package com.mogo.och.common.module.biz.media
 import com.alibaba.android.arouter.facade.template.IProvider
 import com.mogo.och.common.module.biz.media.data.MusicData
 import com.mogo.och.common.module.wigets.media.MediaItem
+import com.mogo.tts.base.IMogoTTSCallback
+import com.mogo.tts.base.LangTtsEntity

 interface MediaService : IProvider {

-    fun addMediaListener(tag: String, listener: IMediaListener)
+    fun addVideoListener(tag: String, listener: IVideoListener)

-    fun removeBridgeListener(tag: String)
+    fun removeVideoListener(tag: String)

    fun postSiteIntroduceInfo(list: MutableList<MediaItem>)

@@ -44,4 +46,16 @@ interface MediaService : IProvider {

    fun getAuditionDataList(): MutableList<MusicData>

+    fun showNotice(notice: String?, level: Int, delayed: Long, callBack: IMogoTTSCallback?)
+
+    fun showNotice(listTTS: MutableList<LangTtsEntity>, level: Int, callBack: IMogoTTSCallback?=null)
+
+    fun stopTTs()
+
+    fun loadOuttts()
+
+    fun releaseOuttts()
+
+    fun showNoticeOut(notice: String?)
+
 }
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/media/VoiceNotice.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/media/VoiceNotice.kt
@@ -0,0 +1,47 @@
+package com.mogo.och.common.module.biz.media
+
+import com.mogo.commons.voice.AIAssist
+import com.mogo.tts.base.IMogoTTSCallback
+import com.mogo.tts.base.LangTtsEntity
+
+object VoiceNotice {
+
+    @JvmStatic
+    fun showNoticeOut(notice: String?) {
+        MediaManager.Tts.showNoticeOut(notice)
+    }
+
+    @JvmStatic
+    fun showNotice(notice: String?) {
+        showNotice(notice, AIAssist.LEVEL0)
+    }
+
+    @JvmStatic
+    fun showNotice(notice: String?, level: Int) {
+        showNotice(notice,level,0)
+    }
+
+    @JvmStatic
+    fun showNotice(notice: String?, level: Int, delayed: Long) {
+        showNotice(notice, level, delayed,null)
+    }
+
+    @JvmStatic
+    fun showNotice(notice: String?, level: Int, delayed: Long = 0,callBack:IMogoTTSCallback?=null) {
+        MediaManager.Tts.showNotice(notice,level,delayed,callBack)
+    }
+
+    @JvmStatic
+    fun showNotice(listTTS: MutableList<LangTtsEntity>, level: Int,callBack: IMogoTTSCallback?=null) {
+        MediaManager.Tts.showNotice(listTTS,level,callBack)
+    }
+
+    /**
+     * 中断当前在播语音
+     */
+    @JvmStatic
+    fun stopCurrentTts(){
+        MediaManager.Tts.stopTts()
+    }
+
+}
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/lan/LanSocketManager.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/lan/LanSocketManager.kt
@@ -8,7 +8,6 @@ import android.os.Build
 import androidx.annotation.RequiresApi
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.voice.AIAssist
-import com.mogo.commons.voice.IMogoVoiceCmdCallBack
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.util.GsonUtils
@@ -18,7 +17,8 @@ import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager
 import com.mogo.och.common.module.manager.socket.lan.bean.AppConnectMsg
 import com.mogo.och.common.module.manager.socket.lan.bean.BaseDPMsg
 import com.mogo.och.common.module.utils.DateTimeUtil
-import com.mogo.och.common.module.voice.VoiceNotice
+import com.mogo.och.common.module.biz.media.VoiceNotice
+import com.mogo.tts.base.IMogoTTSCallback


 object LanSocketManager : LanSocketManagerJava() {
@@ -90,19 +90,18 @@ object LanSocketManager : LanSocketManagerJava() {
                .build()
        mAudioManager.requestAudioFocus(mAudioFocusRequest) //抢占焦点

-        VoiceNotice
-            .speakTTSVoiceWithLevel(msg, AIAssist.LEVEL0, object : IMogoVoiceCmdCallBack {
-                override fun onSpeakEnd(speakText: String?) {
-                    mAudioManager.abandonAudioFocusRequest(mAudioFocusRequest)
-                }
+        VoiceNotice.showNotice(msg,AIAssist.LEVEL0,0,object :IMogoTTSCallback{
+            override fun onSpeakEnd(speakText: String?) {
+                mAudioManager.abandonAudioFocusRequest(mAudioFocusRequest)
+            }

-                override fun onSpeakError(speakText: String?, errorMsg: String?) {
-                    mAudioManager.abandonAudioFocusRequest(mAudioFocusRequest)
-                }
+            override fun onSpeakError(speakText: String?, errorMsg: String?) {
+                mAudioManager.abandonAudioFocusRequest(mAudioFocusRequest)
+            }

-                override fun onSpeakSelectTimeOut(speakText: String?) {
-                    mAudioManager.abandonAudioFocusRequest(mAudioFocusRequest)
-                }
-            })
+            override fun onSpeakSelectTimeOut(speakText: String?) {
+                mAudioManager.abandonAudioFocusRequest(mAudioFocusRequest)
+            }
+        })
    }
 }
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaPlayerActivity.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaPlayerActivity.kt
@@ -1,21 +1,11 @@
 package com.mogo.och.common.module.wigets.media

-import android.Manifest
-import android.app.ActivityOptions
-import android.content.Intent
-import android.content.pm.PackageManager
 import android.os.Bundle
-import android.provider.Settings
-import android.view.Display
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.ContextCompat
-import com.mogo.eagle.core.function.main.MainLauncherActivity
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i
 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.BarUtils
 import com.mogo.och.common.module.R
-import com.mogo.och.common.module.utils.RxUtils

 class MediaPlayerActivity : AppCompatActivity() {

@@ -24,7 +14,7 @@ class MediaPlayerActivity : AppCompatActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        setContentView(R.layout.activity_video_player)
-        val fragment = MediaPlayerFragment()
+        val fragment = VideoPlayerFragment()
        supportFragmentManager.beginTransaction().add(R.id.videoPlayerContainer, fragment)
            .commitAllowingStateLoss()
        BarUtils.hideStatusBarAndSticky(this.window)
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/VideoPlayerFragment.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/VideoPlayerFragment.kt
@@ -9,7 +9,7 @@ import com.mogo.eagle.core.utilcode.util.GsonUtils
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.common.module.R
-import com.mogo.och.common.module.biz.media.IMediaListener
+import com.mogo.och.common.module.biz.media.IVideoListener
 import com.mogo.och.common.module.biz.media.MediaManager
 import com.mogo.och.common.module.manager.download.DownloadManager
 import com.mogo.och.common.module.manager.loop.BizLoopManager
@@ -23,11 +23,11 @@ import kotlinx.android.synthetic.main.fragment_video_player.imageVideoRotationVi
 * @author: wangmingjun
 * @date: 2022/4/12
 */
-class MediaPlayerFragment :
-    MvpFragment<MediaPlayerFragment?, MediaPlayerPresenter?>(), IMediaListener {
+class VideoPlayerFragment :
+    MvpFragment<VideoPlayerFragment?, MediaPlayerPresenter?>(), IVideoListener {

    companion object {
-        private val TAG = MediaPlayerFragment::class.java.simpleName
+        private val TAG = VideoPlayerFragment::class.java.simpleName
    }

    private var arrayListOf = mutableListOf<MediaItem>()
@@ -130,5 +130,5 @@ class MediaPlayerFragment :
    }
 }

-class MediaPlayerPresenter(view: MediaPlayerFragment?) :
-    Presenter<MediaPlayerFragment?>(view)
+class MediaPlayerPresenter(view: VideoPlayerFragment?) :
+    Presenter<VideoPlayerFragment?>(view)
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/ShuttleVoiceManager.kt
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/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.offline.R
 import com.mogo.skin.utils.SkinResources
 import com.mogo.tts.base.LangTtsEntity
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt
+++ b/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
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/ShuttleVoiceManager.kt
+++ b/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
--- a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2BaseFragment.kt
+++ b/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()

--- a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/MindViewModel.kt
+++ b/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 {
--- a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/ShuttlePassengerProvider.kt
+++ b/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
    }

--- a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/CommonModel.kt
+++ b/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
--- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/SweeperCloudFragment.kt
+++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/SweeperCloudFragment.kt
@@ -15,7 +15,7 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.map.overlay.core.Level
 import com.mogo.map.overlay.point.Point
 import com.mogo.och.common.module.utils.OCHThreadPoolManager
-import com.mogo.och.common.module.voice.VoiceNotice.showNotice
+import com.mogo.och.common.module.biz.media.VoiceNotice.showNotice
 import com.mogo.och.sweeper.R
 import com.mogo.och.sweeper.cloud.presenter.SweeperCloudPresenter
 import com.mogo.och.sweeper.cloud.ui.dialog.SweeperCloudDialog
--- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperCloudTaskUtils.kt
+++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperCloudTaskUtils.kt
@@ -13,7 +13,7 @@ import com.mogo.map.overlay.core.Level
 import com.mogo.map.overlay.point.Point
 import com.mogo.och.common.module.utils.DateTimeUtil
 import com.mogo.och.common.module.utils.OCHThreadPoolManager
-import com.mogo.och.common.module.voice.VoiceNotice
+import com.mogo.och.common.module.biz.media.VoiceNotice
 import com.mogo.och.sweeper.R
 import com.mogo.och.sweeper.cloud.model.SweeperCloudTaskModel
 import com.zhjt.mogo.adas.data.AiCloudTask
--- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperOperateTaskModel.java
+++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperOperateTaskModel.java
@@ -43,7 +43,7 @@ import com.mogo.och.bridge.utils.CoordinateCalculateRouteUtil;
 import com.mogo.och.common.module.utils.NumberFormatUtil;
 import com.mogo.och.common.module.utils.PinYinUtil;
 import com.mogo.och.common.module.utils.ToastUtilsOch;
-import com.mogo.och.common.module.voice.VoiceNotice;
+import com.mogo.och.common.module.biz.media.VoiceNotice;
 import com.mogo.och.sweeper.R;
 import com.mogo.och.sweeper.common.bean.SweeperRoutePlanningUpdateReqBean;
 import com.mogo.och.sweeper.common.callback.ISweeperADASStatusCallback;
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt
@@ -1,12 +1,9 @@
 package com.mogo.och.unmanned.taxi.ui.task

 import android.content.Context
-import android.net.ConnectivityManager
 import android.text.TextUtils
 import com.amap.api.maps.model.LatLng
 import com.mogo.commons.AbsMogoApplication
-import com.mogo.commons.module.intent.IMogoIntentListener
-import com.mogo.commons.module.intent.IntentManager
 import com.mogo.commons.module.status.MogoStatusManager
 import com.mogo.eagle.core.data.BaseData
 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
@@ -61,7 +58,7 @@ import com.mogo.och.common.module.manager.loop.BizLoopManager
 import com.mogo.och.common.module.utils.OCHThreadPoolManager
 import com.mogo.och.common.module.utils.ResourcesUtils
 import com.mogo.och.common.module.utils.RxUtils
-import com.mogo.och.common.module.voice.VoiceNotice
+import com.mogo.och.common.module.biz.media.VoiceNotice
 import com.mogo.och.data.bean.BusStationBean
 import com.mogo.och.data.bean.LineInfo
 import com.mogo.och.data.taxi.QueryCarOrderByNoRespBean
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentModel.kt
@@ -22,7 +22,7 @@ import com.mogo.och.common.module.biz.birdge.BridgeManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.common.module.utils.ToastUtilsOch
-import com.mogo.och.common.module.voice.VoiceNotice
+import com.mogo.och.common.module.biz.media.VoiceNotice
 import com.mogo.och.unmanned.taxi.R
 import com.mogo.och.unmanned.taxi.base.BaseViewModel
 import com.mogo.och.unmanned.taxi.base.IUiIntent
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt
@@ -31,7 +31,7 @@ import com.mogo.och.common.module.utils.DateTimeUtil
 import com.mogo.och.common.module.utils.FlowBus
 import com.mogo.och.common.module.utils.OchPhoneUtil
 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.common.module.wigets.CommonSlideView
 import com.mogo.och.common.module.wigets.dialog.CommonDialogStatus
 import com.mogo.och.unmanned.taxi.R
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt
@@ -18,7 +18,7 @@ import com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager
 import com.mogo.och.bridge.autopilot.autopilot.OchAutopilotAnalytics
 import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
-import com.mogo.och.common.module.voice.VoiceNotice
+import com.mogo.och.common.module.biz.media.VoiceNotice
 import com.mogo.och.data.taxi.TaxiOrderStatusEnum
 import com.mogo.och.unmanned.passenger.bean.TaxiPassengerBaseRespBean
 import com.mogo.och.unmanned.passenger.constant.TaxiPassengerConst
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt
@@ -28,7 +28,7 @@ import com.mogo.och.common.module.manager.loop.BizLoopManager
 import com.mogo.och.common.module.manager.loop.LoopInfo
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.common.module.utils.RxUtils
-import com.mogo.och.common.module.voice.VoiceNotice
+import com.mogo.och.common.module.biz.media.VoiceNotice
 import com.mogo.och.data.taxi.TaxiOrderStatusEnum
 import com.mogo.och.data.taxi.TaxiOrderStatusEnum.Companion.valueOf
 import com.mogo.och.unmanned.taxi.utils.order.OrderModel
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt
@@ -2,7 +2,6 @@ package com.mogo.och.unmanned.passenger.ui

 import android.animation.Animator
 import android.animation.AnimatorSet
-import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.View
@@ -13,7 +12,6 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI_P
-import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.map.listener.IMogoMapListener
 import com.mogo.mgintelligent.speech.iflytek.WakeUpManager
 import com.mogo.och.common.module.biz.provider.CommonService
@@ -21,17 +19,15 @@ import com.mogo.och.common.module.constant.OchCommonConst
 import com.mogo.och.common.module.manager.loop.BizLoopManager
 import com.mogo.och.common.module.manager.xiaozhi.ZhiStateManager
 import com.mogo.och.common.module.utils.RxUtils
-import com.mogo.och.common.module.voice.VoiceNotice
+import com.mogo.och.common.module.biz.media.VoiceNotice
 import com.mogo.och.unmanned.taxi.passenger.R
 import com.mogo.och.unmanned.passenger.presenter.BaseTaxiPassengerPresenter
 import com.mogo.och.unmanned.passenger.ui.aiview.AIMessageManager
 import com.mogo.och.unmanned.passenger.ui.aiview.bean.AIMessage
 import com.mogo.och.unmanned.passenger.ui.arrived.ArrivedView
-import com.mogo.och.unmanned.passenger.ui.bar.LeftBarView
 import com.mogo.och.unmanned.passenger.ui.bottom.BottomBar
 import com.mogo.och.unmanned.passenger.ui.checkstartautopilot.ChekAndStartAutopilotView
 import com.mogo.och.unmanned.passenger.ui.debug.DebugCallback
-import com.mogo.och.unmanned.passenger.ui.music.MusicModel
 import com.mogo.och.unmanned.passenger.ui.statusview.StatusBarView
 import io.reactivex.disposables.Disposable
 import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.arrivedView
@@ -43,7 +39,6 @@ import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.infoVideoView
 import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.itinerary
 import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.light_setting
 import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.mHomeView
-import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.musicBarView
 import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.mv_music_info
 import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.overMapView
 import kotlinx.android.synthetic.main.taxt_u_p_base_fragment.voice_setting
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/adapter/AIMessageViewHolder.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/adapter/AIMessageViewHolder.kt
@@ -33,7 +33,7 @@ import com.mogo.eagle.core.utilcode.mogo.glide.transform.GlideRoundedCornersTran
 import com.mogo.eagle.core.utilcode.mogo.imageloader.MogoImageView
 import com.mogo.eagle.core.utilcode.util.DateTimeUtils
 import com.mogo.och.common.module.utils.FrameAnimatorContainer
-import com.mogo.och.common.module.voice.VoiceNotice
+import com.mogo.och.common.module.biz.media.VoiceNotice
 import com.mogo.och.unmanned.passenger.ui.aiview.bean.AIMessage
 import com.mogo.och.unmanned.taxi.passenger.R
 import com.youth.banner.Banner
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotViewModel.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotViewModel.kt
@@ -15,7 +15,7 @@ import com.mogo.och.bridge.device.data.DoorPosition
 import com.mogo.och.bridge.device.data.DoorState
 import com.mogo.och.common.module.manager.loop.BizLoopManager
 import com.mogo.och.common.module.utils.RxUtils
-import com.mogo.och.common.module.voice.VoiceNotice
+import com.mogo.och.common.module.biz.media.VoiceNotice
 import com.mogo.och.unmanned.passenger.model.AutopilotManager
 import com.mogo.och.unmanned.passenger.model.TaxiPassengerModel
 import com.mogo.och.unmanned.taxi.passenger.R
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/evaluate/EvaluateView.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/evaluate/EvaluateView.kt
@@ -14,7 +14,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.och.common.module.manager.xiaozhi.ZhiViewmanager
 import com.mogo.och.common.module.utils.FrameAnimatorContainer
 import com.mogo.och.common.module.utils.RxUtils
-import com.mogo.och.common.module.voice.VoiceNotice
+import com.mogo.och.common.module.biz.media.VoiceNotice
 import com.mogo.och.unmanned.taxi.passenger.R
 import kotlinx.android.synthetic.main.taxi_p_evaluate.view.iv_evaluate_great
 import kotlinx.android.synthetic.main.taxi_p_evaluate.view.iv_evaluate_low
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/NumberCheckView.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/NumberCheckView.kt
@@ -6,13 +6,12 @@ import android.view.LayoutInflater
 import android.view.View
 import android.widget.FrameLayout
 import android.widget.TextView
-import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
 import com.mogo.commons.voice.AIAssist
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.ToastUtils
-import com.mogo.och.common.module.voice.VoiceNotice
+import com.mogo.och.common.module.biz.media.VoiceNotice
 import com.mogo.och.unmanned.taxi.passenger.R
 import kotlinx.android.synthetic.main.taxt_u_p_check_number.view.tv_taxi_passenger_number_back
 import kotlinx.android.synthetic.main.taxt_u_p_check_number.view.tv_taxi_passenger_number_eight