[8.5.0]

[singapore]
[前后屏展示]

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java

@@ -120,7 +120,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
                 long oldTime = SharedPrefsMgr.getInstance().getLong("roadwork", 0);
                 if (currentTime - oldTime > 60) { //超过一分钟，才会继续播报重复提醒
                     SharedPrefsMgr.getInstance().putLong("roadwork", System.currentTimeMillis() / 1000);
-                    CallerAutoPilotControlManager.sendTripInfo(5, "", "", "", false);
+                    CallerAutoPilotControlManager.sendTripInfo(5, "", "", "", false,"");
                 }
             }
 

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/DataCenterProvider.kt

@@ -40,7 +40,8 @@ class DataCenterProvider : IDataCenterProvider, IDataCenterBizListener {
         super.invokeVehicleChange()
         IotManager.init(
             AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode),
-            AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)
+            AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode),
+            AppIdentityModeUtils.isB4(FunctionBuildConfig.appIdentityMode)
         )
     }
 

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt

@@ -57,6 +57,7 @@ import com.mogo.eagle.core.utilcode.util.StringUtils
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
+import com.mogo.support.device.culed.CuLedManager
 import com.mogo.support.device.led.LedSourceManager
 import com.mogo.telematic.MogoProtocolMsg
 import com.mogo.telematic.MogoProtocolMsg.NORMAL_DATA
@@ -1091,7 +1092,7 @@ class MoGoAutopilotControlProvider :
      * @param isLastStop        是否最终站
      * @return boolean
      */
-    override fun sendTripInfo(type: Int, lineName: String, departureStopName: String, arrivalStopName: String, isLastStop: Boolean) {
+    override fun sendTripInfo(type: Int, lineName: String, departureStopName: String, arrivalStopName: String, isLastStop: Boolean,lastStopName:String) {
         AdasManager.getInstance().sendTripInfoReq(type, lineName, departureStopName, arrivalStopName, isLastStop)
         LedSourceManager.updateTripInfoData(
                 type,
@@ -1100,6 +1101,10 @@ class MoGoAutopilotControlProvider :
                 arrivalStopName,
                 isLastStop
         )
+        CuLedManager.updateTripInfoData(type,
+            lineName,
+            lastStopName
+        )
     }
 
     /**

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt

@@ -101,6 +101,7 @@ import com.mogo.eagle.core.function.call.obu.CallerObuWarningSpatListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_D_C
 import com.mogo.eagle.core.utilcode.util.DeviceUtils
+import com.mogo.support.device.culed.CuLedManager
 import com.mogo.support.device.led.LedSourceManager
 import com.mogo.support.obu.ObuScene
 import com.zhidao.support.adas.high.AdasManager
@@ -327,6 +328,7 @@ class MoGoAdasListenerImpl : OnAdasListener {
             type = 3
         }
         LedSourceManager.updateTurnSignalData(type)
+        CuLedManager.updateTurnSignalData(type)
     }
 
     //自动驾驶状态

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/iot/IotManager.kt

@@ -12,6 +12,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i
 import com.mogo.eagle.core.utilcode.util.StringUtils
 import com.mogo.support.device.DevicesManager
 import com.mogo.support.device.IWriteChainLogListener
+import com.mogo.support.device.culed.CuLedManager
 import com.mogo.support.device.led.LedSourceManager
 import com.zhjt.service.chain.ChainLog
 import java.text.SimpleDateFormat
@@ -24,7 +25,7 @@ object IotManager : IMoGoCloudListener, IWriteChainLogListener {
     private const val EVENT_KEY_HARDWARE_DEVICES = "event_key_hardware_devices"
     private var isPassenger: Boolean = false
 
-    fun init(isPassenger: Boolean, isB2: Boolean) {
+    fun init(isPassenger: Boolean, isB2: Boolean, isB4: Boolean) {
         destroy()//重新初始化时销毁之前调用的数据
         this.isPassenger = isPassenger
         if (isPassenger) {
@@ -34,6 +35,10 @@ object IotManager : IMoGoCloudListener, IWriteChainLogListener {
         } else {
             LedSourceManager.registerWriteChainLogListener(this)
             LedSourceManager.init(true, isB2)
+            if(isB4){
+                CuLedManager.init()
+                CuLedManager.registerWriteChainLogListener(this)
+            }
         }
     }
 
@@ -58,6 +63,7 @@ object IotManager : IMoGoCloudListener, IWriteChainLogListener {
             DevicesManager.destroy()
         } else {
             LedSourceManager.unregisterWriteChainLogListener()
+            CuLedManager.unregisterWriteChainLogListener()
             LedSourceManager.destroy()
         }
     }