[8.1.4]

[fea]
[tts 司机屏乘客屏车外]

OCH/common/bridge/src/main/java/com/mogo/och/bridge/BridgeProvider.kt

@@ -10,6 +10,8 @@ import com.mogo.eagle.core.utilcode.util.CoordinateUtils
 import com.mogo.och.bridge.autopilot.location.OchLocationManager
 import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager
 import com.mogo.och.bridge.bridge.OchBridgeManager
+import com.mogo.och.bridge.bridge.OchCollisionRiskManager
+import com.mogo.och.bridge.bridge.OchPncManager
 import com.mogo.och.bridge.bridge.OchVlmManager
 import com.mogo.och.bridge.trajectory.TrajectoryManager
 import com.mogo.och.common.module.biz.birdge.BridgeService
@@ -35,10 +37,9 @@ class BridgeProvider : BridgeService, CallerBase<BridgeListener>() {
 
         // 车前引导线+预测数据
         OchBridgeManager.load()
-
-//        if(EnvManager.isT1T2Passenger()){
-            OchVlmManager.load()
-//        }
+        OchVlmManager.load()
+        OchPncManager.load()
+        OchCollisionRiskManager.load()
 
         TrajectoryManager.load()
     }
@@ -114,5 +115,17 @@ class BridgeProvider : BridgeService, CallerBase<BridgeListener>() {
         }
     }
 
+    fun invokePncData(pncAction:String){
+        M_LISTENERS.forEach {
+            it.value.onPncInfoListener(pncAction)
+        }
+    }
+
+    fun invokeCollisionRisk(){
+        M_LISTENERS.forEach {
+            it.value.onCollisionRisk()
+        }
+    }
+
 
 }

OCH/common/bridge/src/main/java/com/mogo/och/bridge/BridgeServiceManager.kt

@@ -46,4 +46,12 @@ object BridgeServiceManager {
         this.bridgeService?.inVokeNdeData(title,desc,sortedList)
     }
 
+    fun invokePncData(pncAction:String){
+        this.bridgeService?.invokePncData(pncAction)
+    }
+
+    fun collisionRisk() {
+        this.bridgeService?.invokeCollisionRisk()
+    }
+
 }

OCH/common/bridge/src/main/java/com/mogo/och/bridge/bridge/OchCollisionRiskManager.kt

@@ -0,0 +1,22 @@
+package com.mogo.och.bridge.bridge
+
+import com.mogo.eagle.core.function.api.devatools.ICollisionRiskListener
+import com.mogo.eagle.core.function.call.devatools.CallerCollisionRiskManager
+import com.mogo.och.bridge.BridgeServiceManager
+
+object OchCollisionRiskManager : ICollisionRiskListener {
+
+    private const val TAG = "OchCollisionRiskManager"
+    fun load() {
+        CallerCollisionRiskManager.addListener(TAG, this)
+    }
+
+    fun release() {
+        CallerCollisionRiskManager.removeListener(TAG)
+    }
+
+    override fun onCollisionRisk() {
+        BridgeServiceManager.collisionRisk()
+    }
+
+}

OCH/common/bridge/src/main/java/com/mogo/och/bridge/bridge/OchPncManager.kt

@@ -0,0 +1,50 @@
+package com.mogo.och.bridge.bridge
+
+import com.mogo.eagle.core.data.autopilot.pnc.PncActionsHelper
+import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningActionsListener
+import com.mogo.eagle.core.function.call.autopilot.CallerPlanningActionsListenerManager
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OCHCOMMON
+import com.mogo.och.bridge.BridgeServiceManager
+import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
+import kotlin.properties.Delegates
+import mogo.telematics.pad.MessagePad
+
+object OchPncManager : IMoGoAutopilotPlanningActionsListener {
+
+    private val TAG = "${M_OCHCOMMON}OchPncManager"
+
+    private var pncAction: String by Delegates.observable("") { _, oldValue, newValue ->
+        if (oldValue != newValue) {
+            OchChainLogManager.writeCHainLogBridge("pnc消息","oldPnc:$oldValue newPnc:$newValue")
+            BridgeServiceManager.invokePncData(newValue)
+        }
+    }
+
+    fun load(){
+        CallerPlanningActionsListenerManager.addListener(TAG, this)
+    }
+
+    fun release(){
+        CallerPlanningActionsListenerManager.removeListener(TAG)
+    }
+
+    override fun pncActions(planningActionMsg: MessagePad.PlanningActionMsg) {
+        planningActionMsg.actionMsg?.let {
+            try {
+                pncAction = PncActionsHelper.getAction(
+                    it.drivingState.number,
+                    it.drivingAction.number
+                )
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+        planningActionMsg.v2NActionMsgList?.forEach { v2nAction ->
+            pncAction = PncActionsHelper.getAction(
+                v2nAction.drivingState.number,
+                v2nAction.drivingAction.number
+            )
+        }
+    }
+
+}