[6.9.0]

[fix]
[passenger]
[开启直播流后暂停广告播放]

OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt

@@ -24,9 +24,11 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02Lis
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisStatesListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningActionsListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager
+import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.call.map.CallerMapRomaListener
 import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager
+import com.mogo.eagle.core.function.call.och.CallerOchBizFunctionCall4EagleManager
 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
@@ -68,6 +70,7 @@ object DebugDataDispatch {
     const val visualView = "visual"
     const val scanner = "scanner"
     const val ota = "ota"
+    const val video = "video"
 
 //    adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "location" --es path "1111/11111"
 //    adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "globalPath" --es path "sy73.json"
@@ -84,6 +87,7 @@ object DebugDataDispatch {
 //    adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "showDebugView"
 //    adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "scanner" --es qrInfo ""
 //    adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "ota" --ei "ota" 1
+//    adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "video" --ei "video" 1  --es url "rtmp://video.zhidaozhixing.com/live/861130041693196C_2"
 
 
     val ROOT_PATH =
@@ -96,6 +100,20 @@ object DebugDataDispatch {
 
         }
         when (type) {
+            video -> {
+                val ota = intent.getIntExtra("video",0)
+//                rtmp://video.zhidaozhixing.com/live/861130041693196C_2
+                val url = intent.getStringExtra("url")?:""
+                BizLoopManager.runInMainThread(){
+                    if(ota>0&&url.startsWith("rtmp://")){
+                        val driveVideoView = CallerDevaToolsManager.driveSeatVideoProvider()
+                            ?.getDriveVideoView(url)
+                        CallerOchBizFunctionCall4EagleManager.setVideoView(driveVideoView)
+                    }else{
+                        CallerOchBizFunctionCall4EagleManager.setVideoView(null)
+                    }
+                }
+            }
             ota -> {
                 val ota = intent.getIntExtra("ota",0)
                 BizLoopManager.runInIoThread{

OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt

@@ -66,6 +66,15 @@ object OchChainLogManager {
 
     const val EVENT_KEY_INFO_TIME = "analytics_event_och_time"
 
+    const val EVENT_KEY_INFO_CALL_EYE = "analytics_event_call_eye_och"
+
+
+    fun writeChainLogEye(title: String, info: String) {
+        writeChainLog(title, info, true, EVENT_KEY_INFO_CALL_EYE)
+    }
+
+
+
     // 时间方面的日志
     fun writeChainLogTime(title: String, info: String) {
         writeChainLog(title, info, true, EVENT_KEY_INFO_TIME)

OCH/common/common/src/main/java/com/mogo/och/common/module/manager/transform/OchTransform.kt

@@ -4,6 +4,7 @@ import android.view.View
 import com.mogo.eagle.core.function.api.och.IOchBizFunctionCall4Eagle
 import com.mogo.eagle.core.function.call.base.CallerBase
 import com.mogo.eagle.core.function.call.och.CallerOchBizFunctionCall4EagleManager
+import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 
 object OchTransform : CallerBase<OchTransformDispatch>(), IOchBizFunctionCall4Eagle {
 
@@ -12,12 +13,14 @@ object OchTransform : CallerBase<OchTransformDispatch>(), IOchBizFunctionCall4Ea
     }
 
     override fun logout() {
+        OchChainLogManager.writeChainLogEye("鹰眼调用och","退出登录")
         M_LISTENERS.forEach {
             it.value.logout()
         }
     }
 
     override fun setVideoView(target: View?) {
+        OchChainLogManager.writeChainLogEye("鹰眼调用och","展示司机端视频流:${target}")
         M_LISTENERS.forEach {
             it.value.setVideoView(target)
         }

OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaPlayerCustomView.kt

@@ -318,7 +318,7 @@ class AdvanceGSYVideoPlayer : StandardGSYVideoPlayer {
 
     override fun changeUiToPauseShow() {
         Logger.d(MediaLoopPlayView.TAG, "AdvanceGSYVideoPlayer，changeUiToPauseShow-hide")
-        startPlayLogic()
+//        startPlayLogic()
     }
 
     override fun changeUiToCompleteShow() {