[6.9.0]

[fix] [passenger] [开启直播流后暂停广告播放]
2025-01-02 17:03:04 +08:00
parent 61fc2e9519
commit 7c33b4982b
5 changed files with 66 additions and 2 deletions
--- a/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt
+++ b/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
@@ -34,6 +36,8 @@ import com.mogo.eagle.core.utilcode.util.GsonUtils
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.och.common.module.debug.location.MogoLocationExit
 import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager
+import com.mogo.och.common.module.manager.loop.BizLoopManager
+import com.mogo.och.common.module.manager.scnner.ScannerManager
 import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil
 import com.mogo.och.common.module.view.DebugFloatWindow
 import com.zhjt.mogo.adas.data.bean.AutopilotStatistics
@@ -62,6 +66,9 @@ object DebugDataDispatch {
    const val v2N = "xiaozhiV2N"
    const val romal = "romal"
    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"
@@ -76,6 +83,9 @@ object DebugDataDispatch {
 //    adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "romal"  --ei show 0
 //    adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "visual"  --ei show 0
 //    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 =
@@ -88,6 +98,36 @@ 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{
+//                    if(ota>0){
+//                        OrderManager.otaDownLoadStatus = true
+//                    }else{
+//                        OrderManager.otaDownLoadStatus = false
+//                    }
+//                }
+//            }
+            scanner -> {
+                val qrInfo = intent.getStringExtra("qrInfo")
+                BizLoopManager.runInIoThread{
+                    ScannerManager.parseParams("orderNo=1871744897569038336&uid=828aa91f-49a1-f9b3-4526-f58acda9df60&pipe=mogogosafety&phone=houyanli&lineId=134&expiryTime=1735094149070&bookingTime=1735056000000&tenantId=337197925358633123&availableTimes=1&ticketSize=1&ticketName=%E9%80%9A%E5%8B%A4%E7%A5%A8%E3%81%AE&type=14&shiftsId=4249")
+                }
+            }
            globalPathMock -> {
                sourceFilePath?.let {
                    loadRawPoints(ROOT_PATH+it)
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt
@@ -64,6 +64,27 @@ object OchChainLogManager {

    const val EVENT_KEY_INFO_MAP = "analytics_event_och_map"

+    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)
+    }
+
+
+    // 轨迹方面的日志
+    fun writeChainLogTrajectory(title: String, info: String) {
+        writeChainLog(title, info, true, EVENT_KEY_INFE_WITH_TRAJECTORY)
+    }

    fun writeChainLogMap(title: String, info: String) {
        writeChainLog(title, info, true, EVENT_KEY_INFO_MAP)
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/scnner/ScannerManager.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/scnner/ScannerManager.kt
@@ -236,7 +236,7 @@ object ScannerManager : IOchLanPassengerStatusListener {
        }
    }

-    private fun parseParams(payload: String?) {
+    fun parseParams(payload: String?) {
        val parse = Uri.parse("${OchCommonConst.getShuttleUrl()}?${payload}")
        val queryParameterNames = parse.queryParameterNames
        val mutableMapOf = mutableMapOf<String, String>()
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/transform/OchTransform.kt
+++ b/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)
        }
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaPlayerCustomView.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaPlayerCustomView.kt
@@ -271,7 +271,7 @@ class AdvanceGSYVideoPlayer : StandardGSYVideoPlayer {

    override fun changeUiToPauseShow() {
        Logger.d(MediaLoopPlayView.TAG, "AdvanceGSYVideoPlayer，changeUiToPauseShow-hide")
-        startPlayLogic()
+//        startPlayLogic()
    }

    override fun changeUiToCompleteShow() {