[6.6.0]

[led通讯添加日志]

OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java

@@ -12,7 +12,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.elegant.network.utils.GsonUtil;
-import com.mogo.aicloud.services.socket.IMogoOnMessageListener;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.eagle.core.data.BaseData;
 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
@@ -42,7 +41,6 @@ import com.mogo.och.bus.constant.BusConst;
 import com.mogo.och.bus.net.OrderServiceManager;
 import com.mogo.och.bus.presenter.BusModelLoopManager;
 import com.mogo.och.bus.util.BusAnalyticsManager;
-import com.mogo.och.bus.util.BusSendTripInfoManager;
 import com.mogo.och.bus.util.BusTrajectoryManager;
 import com.mogo.och.bus.util.BusVoiceManager;
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager;
@@ -51,9 +49,9 @@ import com.mogo.och.common.module.manager.socket.cloud.IOchOnMessageListener;
 import com.mogo.och.common.module.manager.socket.cloud.action.OperateAction2;
 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.LedScreenManager;
 import com.mogo.och.common.module.manager.socket.lan.bean.AppConnectMsg;
 import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager;
-import com.mogo.och.common.module.manager.socket.cloud.data.OCHOperationalMessage;
 import com.mogo.och.common.module.biz.login.LoginStatusManager;
 import com.mogo.och.common.module.manager.socket.lan.bean.BusCacheKey;
 import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType;
@@ -623,7 +621,7 @@ public class OrderModel {
         backgroundCurrentStationIndex = 0;
 
         if (busRoutesResult != null) {
-            BusSendTripInfoManager.INSTANCE.sendBusTripInfo(BusSendTripInfoManager.END_TRIP
+            LedScreenManager.sendTripInfo2Led(LedScreenManager.END_TRIP
                     , busRoutesResult.getName()
                     , ""
                     , ""
@@ -650,7 +648,7 @@ public class OrderModel {
         if (busRoutesResult != null) {
             boolean isLastStop = leaveIndex + 1 == stationList.size() - 1;
             //给bus外屏发送
-            BusSendTripInfoManager.INSTANCE.sendBusTripInfo(BusSendTripInfoManager.LEAVE_STATION
+            LedScreenManager.sendTripInfo2Led(LedScreenManager.LEAVE_STATION
                     , busRoutesResult.getName()
                     , leaveStation
                     , nextStation
@@ -827,7 +825,7 @@ public class OrderModel {
         if (busRoutesResult != null) {
             boolean isLastStop = arrivedStationIndex == busRoutesResult.getSites().size() - 1;
             //给bus外屏发送
-            BusSendTripInfoManager.INSTANCE.sendBusTripInfo(BusSendTripInfoManager.ARRIVE_STATION
+            LedScreenManager.sendTripInfo2Led(LedScreenManager.ARRIVE_STATION
                     , busRoutesResult.getName()
                     , departureStopName
                     , arriveStation
@@ -975,7 +973,7 @@ public class OrderModel {
                 stationList.get(0).getDrivingStatus() == STATION_STATUS_STOPPED
                 && !stationList.get(0).isLeaving()) { //默认是第一站到站查询
             if (busRoutesResult != null) { // 第一站到站也是行程开始的时候
-                BusSendTripInfoManager.INSTANCE.sendBusTripInfo(BusSendTripInfoManager.START_TRIP
+                LedScreenManager.sendTripInfo2Led(LedScreenManager.START_TRIP
                         , busRoutesResult.getName(), "", "", false);
             }
 

OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt

@@ -14,7 +14,6 @@ import com.magic.mogo.och.charter.constant.CharterConst
 import com.magic.mogo.och.charter.manager.CharterAnalyticsManager
 import com.magic.mogo.och.charter.manager.CharterTrajectoryManager
 import com.magic.mogo.och.charter.net.DriverM1ServiceManager
-import com.mogo.aicloud.services.socket.IMogoOnMessageListener
 import com.mogo.commons.module.intent.IMogoIntentListener
 import com.mogo.commons.module.intent.IntentManager
 import com.mogo.commons.voice.AIAssist
@@ -39,10 +38,6 @@ import com.mogo.eagle.core.utilcode.util.*
 import com.mogo.och.common.module.biz.login.LoginStatusManager
 import com.mogo.och.common.module.callback.OchAdasStartFailureCallback
 import com.mogo.och.common.module.constant.OchCommonConst
-import com.mogo.och.common.module.manager.CharterSendTripInfoManager
-import com.mogo.och.common.module.manager.CharterSendTripInfoManager.ARRIVE_STATION
-import com.mogo.och.common.module.manager.CharterSendTripInfoManager.END_TRIP
-import com.mogo.och.common.module.manager.CharterSendTripInfoManager.START_TRIP
 import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager
 import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager
@@ -61,6 +56,7 @@ import com.mogo.och.common.module.manager.socket.cloud.action.OperateAction
 import com.mogo.och.common.module.manager.socket.cloud.data.OperateDoorMsg
 import com.mogo.och.common.module.manager.socket.cloud.data.OrderCloseMsg
 import com.mogo.och.common.module.manager.socket.lan.LanSocketManager
+import com.mogo.och.common.module.manager.socket.lan.LedScreenManager
 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.manager.socket.lan.bean.ChangeDestMsg
@@ -404,7 +400,7 @@ class DriverM1Model {
 
     private fun onArriveAtSuccess() {
         isArrivedStation = true
-        CharterSendTripInfoManager.sendCharterTripInfo(ARRIVE_STATION,mCurrentOrder?.lineName!!
+        LedScreenManager.sendTripInfo2Led(LedScreenManager.ARRIVE_STATION,mCurrentOrder?.lineName!!
             ,mCurrentOrder?.startSiteName!!,mCurrentOrder?.siteName!!,false)
 
         if (currentChangeDestMsg != null){
@@ -764,13 +760,13 @@ class DriverM1Model {
      */
     private fun sendCharterStartTripInfo() {
         if (mCurrentOrder == null) return
-        CharterSendTripInfoManager.sendCharterTripInfo(START_TRIP,mCurrentOrder?.lineName!!
+        LedScreenManager.sendTripInfo2Led(LedScreenManager.START_TRIP,mCurrentOrder?.lineName!!
                 ,"","",false)
     }
 
     private fun sendCharterEndTripInfo() {
         if (mCurrentOrder == null) return
-        CharterSendTripInfoManager.sendCharterTripInfo(END_TRIP,mCurrentOrder?.lineName!!
+        LedScreenManager.sendTripInfo2Led(LedScreenManager.END_TRIP,mCurrentOrder?.lineName!!
             ,"","",false)
     }
 

OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt

@@ -38,13 +38,9 @@ import com.mogo.och.common.module.manager.socket.lan.bean.BaseDPMsg
 import com.mogo.och.common.module.manager.socket.lan.bean.ChangeDestMsg
 import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager
 import com.mogo.och.common.module.biz.login.LoginStatusManager
-import com.mogo.och.common.module.constant.OchCommonConst
 import com.mogo.och.common.module.biz.login.ILoginCallback
 import com.mogo.och.common.module.biz.login.LoginStatusEnum
 import com.mogo.och.common.module.network.OchCommonServiceCallback
-import com.mogo.och.common.module.manager.CharterSendTripInfoManager
-import com.mogo.och.common.module.manager.CharterSendTripInfoManager.LEAVE_STATION
-import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager
 import com.mogo.och.common.module.manager.autopilot.autopilot.ArrivedStation
 import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager
@@ -54,6 +50,7 @@ import com.mogo.och.common.module.manager.beautifymode.BeautifyManager
 import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.common.module.manager.socket.lan.LanSocketManager
+import com.mogo.och.common.module.manager.socket.lan.LedScreenManager
 import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil
 import com.mogo.och.common.module.utils.DateTimeUtil
 import com.mogo.och.common.module.utils.PinYinUtil
@@ -1215,8 +1212,8 @@ object CharterPassengerModel {
         //发送前后屏出站消息 3：代表出站
         orderInfo?.let {
             if(!it.lineName.isNullOrEmpty()&&!it.startSiteName.isNullOrEmpty()&&!it.siteName.isNullOrEmpty()) {
-                CharterSendTripInfoManager.sendCharterTripInfo(
+                LedScreenManager.sendTripInfo2Led(
-                    LEAVE_STATION,
+                    LedScreenManager.LEAVE_STATION,
                     it.lineName, it.startSiteName!!, it.siteName!!, false
                 )
             }

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

@@ -1,36 +0,0 @@
-package com.mogo.och.common.module.manager
-
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
-import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
-
-/**
- * @author: wangmingjun
- * @date: 2022/10/24
- */
-object CharterSendTripInfoManager{
-
-    const val START_TRIP = 1
-    const val END_TRIP = 2
-    const val LEAVE_STATION = 3
-    const val ARRIVE_STATION = 4
-
-    /**
-     * 行程信息
-     * @param type  事件类型, 1:行程开始, 2:行程结束, 3:出站, 4:进站, 5:城市占道施工预警
-     * @param lineName 路线名, for type 1, 2
-     * @param departureStopName 出站站点名, for type 3, 4
-     * @param arrivalStopName 下一站到达站点名, for type 3, 4
-     * @param isLastStop 是否终点站(下一站或者要到达站)
-     * @return
-     */
-    fun sendCharterTripInfo(type: Int, lineName: String,
-                        departureStopName: String,
-                        arrivalStopName: String,
-                        isLastStop: Boolean) {
-        d(SceneConstant.M_BUS + "CharterSendTripInfoManager", "type: "+ type
-                +", lineName: "+ lineName +", departureStopName: "+ departureStopName
-                + ", arrivalStopName: "+arrivalStopName+", isLastStop: "+isLastStop)
-        CallerAutoPilotControlManager.sendTripInfo(type,lineName,departureStopName, arrivalStopName, isLastStop)
-    }
-}

OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/lan/LedScreenManager.kt

@@ -1,15 +1,11 @@
-package com.mogo.och.bus.util
+package com.mogo.och.common.module.manager.socket.lan
 
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 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.mogo.logger.scene.SceneConstant.Companion.M_BUS
-
+import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
-/**
- * @author: wangmingjun
- * @date: 2022/10/24
- */
-object BusSendTripInfoManager{
 
+object LedScreenManager {
     const val START_TRIP = 1
     const val END_TRIP = 2
     const val LEAVE_STATION = 3
@@ -24,13 +20,14 @@ object BusSendTripInfoManager{
      * @param isLastStop 是否终点站(下一站或者要到达站)
      * @return
      */
-    fun sendBusTripInfo(type: Int, lineName: String,
+    @JvmStatic
-                        departureStopName: String,
+    fun sendTripInfo2Led(type: Int, lineName: String,
-                        arrivalStopName: String,
+                         departureStopName: String,
-                        isLastStop: Boolean) {
+                         arrivalStopName: String,
-        d(SceneConstant.M_BUS + "BusSendTripInfoManager", "type: "+ type
+                         isLastStop: Boolean) {
-                +", lineName: "+ lineName +", departureStopName: "+ departureStopName
+        val logInfo = "type: $type, lineName: $lineName, departureStopName: $departureStopName, arrivalStopName: $arrivalStopName, isLastStop: $isLastStop"
-                + ", arrivalStopName: "+arrivalStopName+", isLastStop: "+isLastStop)
+        d(M_BUS + "BusSendTripInfoManager", logInfo)
+        OchChainLogManager.writeChainLogLanSocket("发送msg到外屏Led",logInfo,"send")
         CallerAutoPilotControlManager.sendTripInfo(type,lineName,departureStopName, arrivalStopName, isLastStop)
     }
 }

OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java

@@ -12,7 +12,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.elegant.network.utils.GsonUtil;
-import com.mogo.aicloud.services.socket.IMogoOnMessageListener;
 import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener;
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager;
 import com.mogo.eagle.core.utilcode.util.CoordinateUtils;
@@ -25,6 +24,7 @@ import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManage
 import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager;
 import com.mogo.och.common.module.manager.socket.cloud.action.OperateAction;
 import com.mogo.och.common.module.manager.socket.lan.LanSocketManager;
+import com.mogo.och.common.module.manager.socket.lan.LedScreenManager;
 import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType;
 import com.mogo.och.common.module.voice.VoiceNotice;
 import com.mogo.och.offline.R;
@@ -37,10 +37,8 @@ import com.mogo.och.common.module.manager.socket.lan.bean.TaskDetailsMsg;
 import com.mogo.och.common.module.biz.login.LoginStatusManager;
 import com.mogo.och.common.module.manager.autopilot.autopilot.ArrivedStation;
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager;
-import com.mogo.och.common.module.utils.MultiRequestLimitChecker;
 import com.mogo.och.common.module.utils.OCHThreadPoolManager;
 import com.mogo.och.data.bean.BusStationBean;
-import com.mogo.och.common.module.manager.socket.cloud.data.SystemMsg;
 import com.mogo.och.common.module.constant.OchCommonConst;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener;
@@ -49,7 +47,6 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.GsonUtils;
-import com.mogo.eagle.core.utilcode.util.NetworkUtils;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.och.data.bean.BusRoutesResult;
@@ -58,7 +55,6 @@ import com.mogo.och.offline.callback.IRefreshBusStationsCallback;
 import com.mogo.och.offline.callback.ISlidePannelHideCallback;
 import com.mogo.och.offline.constant.BusConst;
 import com.mogo.och.offline.util.BusAnalyticsManager;
-import com.mogo.och.offline.util.BusSendTripInfoManager;
 import com.mogo.och.offline.util.BusTrajectoryManager;
 import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager;
 import com.mogo.och.common.module.callback.OchAdasStartFailureCallback;
@@ -422,7 +418,7 @@ public class OrderModel {
         backgroundCurrentStationIndex = 0;
 
         if (busRoutesResult != null) {
-            BusSendTripInfoManager.INSTANCE.sendBusTripInfo(BusSendTripInfoManager.END_TRIP
+            LedScreenManager.sendTripInfo2Led(LedScreenManager.END_TRIP
                     , busRoutesResult.getName()
                     , ""
                     , ""
@@ -455,7 +451,7 @@ public class OrderModel {
                 isLastStop = true;
             }
             //给bus外屏发送
-            BusSendTripInfoManager.INSTANCE.sendBusTripInfo(BusSendTripInfoManager.LEAVE_STATION
+            LedScreenManager.sendTripInfo2Led(LedScreenManager.LEAVE_STATION
                     , busRoutesResult.getName()
                     , leaveStation
                     , nextStation
@@ -607,7 +603,7 @@ public class OrderModel {
                 isLastStop = true;
             }
             //给bus外屏发送
-            BusSendTripInfoManager.INSTANCE.sendBusTripInfo(BusSendTripInfoManager.ARRIVE_STATION
+            LedScreenManager.sendTripInfo2Led(LedScreenManager.ARRIVE_STATION
                     , busRoutesResult.getName()
                     , departureStopName
                     , arriveStation
@@ -772,7 +768,7 @@ public class OrderModel {
                 stationList.get(0).getDrivingStatus() == STATION_STATUS_STOPPED
                 && !stationList.get(0).isLeaving()) { //默认是第一站到站查询
             if (busRoutesResult != null) { // 第一站到站也是行程开始的时候
-                BusSendTripInfoManager.INSTANCE.sendBusTripInfo(BusSendTripInfoManager.START_TRIP
+                LedScreenManager.sendTripInfo2Led(LedScreenManager.START_TRIP
                         , busRoutesResult.getName(), "", "", false);
             }
 

OCH/offline/driver/src/main/java/com/mogo/och/offline/util/BusSendTripInfoManager.kt

@@ -1,36 +0,0 @@
-package com.mogo.och.offline.util
-
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
-import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
-
-/**
- * @author: wangmingjun
- * @date: 2022/10/24
- */
-object BusSendTripInfoManager{
-
-    const val START_TRIP = 1
-    const val END_TRIP = 2
-    const val LEAVE_STATION = 3
-    const val ARRIVE_STATION = 4
-
-    /**
-     * 行程信息
-     * @param type  事件类型, 1:行程开始, 2:行程结束, 3:出站, 4:进站, 5:城市占道施工预警
-     * @param lineName 路线名, for type 1, 2
-     * @param departureStopName 出站站点名, for type 3, 4
-     * @param arrivalStopName 下一站到达站点名, for type 3, 4
-     * @param isLastStop 是否终点站(下一站或者要到达站)
-     * @return
-     */
-    fun sendBusTripInfo(type: Int, lineName: String,
-                        departureStopName: String,
-                        arrivalStopName: String,
-                        isLastStop: Boolean) {
-        d(SceneConstant.M_BUS + "BusSendTripInfoManager", "type: "+ type
-                +", lineName: "+ lineName +", departureStopName: "+ departureStopName
-                + ", arrivalStopName: "+arrivalStopName+", isLastStop: "+isLastStop)
-        CallerAutoPilotControlManager.sendTripInfo(type,lineName,departureStopName, arrivalStopName, isLastStop)
-    }
-}

OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java

@@ -41,6 +41,7 @@ import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManage
 import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager;
 import com.mogo.och.common.module.manager.socket.cloud.action.OperateAction;
 import com.mogo.och.common.module.manager.socket.lan.LanSocketManager;
+import com.mogo.och.common.module.manager.socket.lan.LedScreenManager;
 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.manager.socket.lan.bean.BusCacheKey;
@@ -68,7 +69,6 @@ import com.mogo.och.shuttle.callback.ISlidePannelHideCallback;
 import com.mogo.och.shuttle.constant.BusConst;
 import com.mogo.och.shuttle.net.OrderServiceManager;
 import com.mogo.och.shuttle.util.BusAnalyticsManager;
-import com.mogo.och.shuttle.util.BusSendTripInfoManager;
 import com.mogo.och.shuttle.util.BusTrajectoryManager;
 import com.mogo.och.shuttle.util.ShuttleVoiceManager;
 
@@ -510,7 +510,7 @@ public class OrderModel {
         backgroundCurrentStationIndex = 0;
 
         if (busRoutesResult != null) {
-            BusSendTripInfoManager.INSTANCE.sendBusTripInfo(BusSendTripInfoManager.END_TRIP
+            LedScreenManager.sendTripInfo2Led(LedScreenManager.END_TRIP
                     , busRoutesResult.getName()
                     , ""
                     , ""
@@ -544,7 +544,7 @@ public class OrderModel {
                 isLastStop = true;
             }
             //给bus外屏发送
-            BusSendTripInfoManager.INSTANCE.sendBusTripInfo(BusSendTripInfoManager.LEAVE_STATION
+            LedScreenManager.sendTripInfo2Led(LedScreenManager.LEAVE_STATION
                     , busRoutesResult.getName()
                     , leaveStation
                     , nextStation
@@ -726,7 +726,7 @@ public class OrderModel {
                 isLastStop = true;
             }
             //给bus外屏发送
-            BusSendTripInfoManager.INSTANCE.sendBusTripInfo(BusSendTripInfoManager.ARRIVE_STATION
+            LedScreenManager.sendTripInfo2Led(LedScreenManager.ARRIVE_STATION
                     , busRoutesResult.getName()
                     , departureStopName
                     , arriveStation
@@ -910,7 +910,7 @@ public class OrderModel {
                 stationList.get(0).getDrivingStatus() == BusConst.STATION_STATUS_STOPPED
                 && !stationList.get(0).isLeaving()) { //默认是第一站到站查询
             if (busRoutesResult != null) { // 第一站到站也是行程开始的时候
-                BusSendTripInfoManager.INSTANCE.sendBusTripInfo(BusSendTripInfoManager.START_TRIP
+                LedScreenManager.sendTripInfo2Led(LedScreenManager.START_TRIP
                         , busRoutesResult.getName(), "", "", false);
             }
 

OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/util/BusSendTripInfoManager.kt

@@ -1,36 +0,0 @@
-package com.mogo.och.shuttle.util
-
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
-import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
-
-/**
- * @author: wangmingjun
- * @date: 2022/10/24
- */
-object BusSendTripInfoManager{
-
-    const val START_TRIP = 1
-    const val END_TRIP = 2
-    const val LEAVE_STATION = 3
-    const val ARRIVE_STATION = 4
-
-    /**
-     * 行程信息
-     * @param type  事件类型, 1:行程开始, 2:行程结束, 3:出站, 4:进站, 5:城市占道施工预警
-     * @param lineName 路线名, for type 1, 2
-     * @param departureStopName 出站站点名, for type 3, 4
-     * @param arrivalStopName 下一站到达站点名, for type 3, 4
-     * @param isLastStop 是否终点站(下一站或者要到达站)
-     * @return
-     */
-    fun sendBusTripInfo(type: Int, lineName: String,
-                        departureStopName: String,
-                        arrivalStopName: String,
-                        isLastStop: Boolean) {
-        d(SceneConstant.M_BUS + "BusSendTripInfoManager", "type: "+ type
-                +", lineName: "+ lineName +", departureStopName: "+ departureStopName
-                + ", arrivalStopName: "+arrivalStopName+", isLastStop: "+isLastStop)
-        CallerAutoPilotControlManager.sendTripInfo(type,lineName,departureStopName, arrivalStopName, isLastStop)
-    }
-}

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt

@@ -46,6 +46,7 @@ import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager
 import com.mogo.och.common.module.manager.socket.cloud.action.OperateAction
 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.LedScreenManager
 import com.mogo.och.common.module.manager.socket.lan.bean.BusCacheKey
 import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType
 import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType
@@ -76,8 +77,6 @@ import com.mogo.och.weaknet.net.OrderServiceManager
 import com.mogo.och.weaknet.net.OrderServiceManager.endTask
 import com.mogo.och.weaknet.net.OrderServiceManager.leaveStation
 import com.mogo.och.weaknet.util.BusAnalyticsManager
-import com.mogo.och.weaknet.util.BusSendTripInfoManager
-import com.mogo.och.weaknet.util.BusSendTripInfoManager.sendBusTripInfo
 import com.mogo.och.weaknet.util.BusTrajectoryManager
 import com.mogo.och.weaknet.util.ShuttleVoiceManager
 
@@ -453,8 +452,8 @@ object OrderModel {
         currentStationIndex = 0
 
         if (busRoutesResult != null) {
-            sendBusTripInfo(
+            LedScreenManager.sendTripInfo2Led(
-                BusSendTripInfoManager.END_TRIP,
+                LedScreenManager.END_TRIP,
                 busRoutesResult!!.name,
                 "",
                 "",
@@ -488,8 +487,8 @@ object OrderModel {
                 isLastStop = true
             }
             //给bus外屏发送
-            sendBusTripInfo(
+            LedScreenManager.sendTripInfo2Led(
-                BusSendTripInfoManager.LEAVE_STATION,
+                LedScreenManager.LEAVE_STATION,
                 busRoutesResult!!.name,
                 leaveStation,
                 nextStation,
@@ -688,8 +687,8 @@ object OrderModel {
                 isLastStop = true
             }
             //给bus外屏发送
-            sendBusTripInfo(
+            LedScreenManager.sendTripInfo2Led(
-                BusSendTripInfoManager.ARRIVE_STATION,
+                LedScreenManager.ARRIVE_STATION,
                 busRoutesResult!!.name,
                 departureStopName,
                 arriveStation,
@@ -861,8 +860,8 @@ object OrderModel {
         if (currentStationIndex == 0 && stationList[0].drivingStatus == BusConst.STATION_STATUS_STOPPED && !stationList[0].isLeaving
         ) { //默认是第一站到站查询
             if (busRoutesResult != null) { // 第一站到站也是行程开始的时候
-                sendBusTripInfo(
+                LedScreenManager.sendTripInfo2Led(
-                    BusSendTripInfoManager.START_TRIP,
+                    LedScreenManager.START_TRIP,
                     busRoutesResult!!.name, "", "", false
                 )
             }

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusSendTripInfoManager.kt

@@ -1,36 +0,0 @@
-package com.mogo.och.weaknet.util
-
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
-import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
-
-/**
- * @author: wangmingjun
- * @date: 2022/10/24
- */
-object BusSendTripInfoManager{
-
-    const val START_TRIP = 1
-    const val END_TRIP = 2
-    const val LEAVE_STATION = 3
-    const val ARRIVE_STATION = 4
-
-    /**
-     * 行程信息
-     * @param type  事件类型, 1:行程开始, 2:行程结束, 3:出站, 4:进站, 5:城市占道施工预警
-     * @param lineName 路线名, for type 1, 2
-     * @param departureStopName 出站站点名, for type 3, 4
-     * @param arrivalStopName 下一站到达站点名, for type 3, 4
-     * @param isLastStop 是否终点站(下一站或者要到达站)
-     * @return
-     */
-    fun sendBusTripInfo(type: Int, lineName: String,
-                        departureStopName: String,
-                        arrivalStopName: String,
-                        isLastStop: Boolean) {
-        d(SceneConstant.M_BUS + "BusSendTripInfoManager", "type: "+ type
-                +", lineName: "+ lineName +", departureStopName: "+ departureStopName
-                + ", arrivalStopName: "+arrivalStopName+", isLastStop: "+isLastStop)
-        CallerAutoPilotControlManager.sendTripInfo(type,lineName,departureStopName, arrivalStopName, isLastStop)
-    }
-}