[6.4.0]

[局域网内网络通讯]
2024-04-15 17:25:05 +08:00
parent 03cfb628bf
commit c42af54904
15 changed files with 78 additions and 119 deletions
--- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java
+++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java
@@ -54,6 +54,7 @@ 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.socket.lan.LanSocketManager;
 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;
@@ -1131,9 +1132,7 @@ public class OrderModel {

    public void sendWriteOffNumToClient(String msg){
        AppConnectMsg passengerMsg = new AppConnectMsg(false,true,msg,-1);
-
-        CallerTelematicManager.INSTANCE.sendMsgToAllClients(OchCommonConst.BUSINESS_STRING,
-                GsonUtils.toJson(passengerMsg).getBytes());
+        LanSocketManager.sendMsgToClient(passengerMsg);
    }

    // 车机端上传心跳数据（只在出车状态时上传）
--- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/model/PM2DrivingModel.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/model/PM2DrivingModel.kt
@@ -20,7 +20,6 @@ import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager
-import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager.sendMsgToServer
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS_P
@@ -32,7 +31,6 @@ import com.mogo.och.bus.passenger.bean.BusPassengerOperationStatusResponse
 import com.mogo.och.bus.passenger.constant.BusPassengerConst
 import com.mogo.och.bus.passenger.passenger.callback.AutoPilotStatusCallback
 import com.mogo.och.bus.passenger.passenger.callback.DrivingInfoCallback
-import com.mogo.och.common.module.bean.dpmsg.*
 import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager.pushAppOperationalMsgBox
 import com.mogo.och.common.module.constant.OchCommonConst
 import com.mogo.och.common.module.network.OchCommonServiceCallback
@@ -46,6 +44,7 @@ import com.mogo.och.common.module.manager.distance.IDistanceListener
 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.loop.LoopInfo
+import com.mogo.och.common.module.manager.socket.lan.LanSocketManager
 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.DPMsgType
@@ -105,7 +104,7 @@ class PM2DrivingModel private constructor() {
    private fun queryDriverByLocalDriver() {
        //本地去请求司机端
        val msg = TaskDetailsMsg("task")
-        sendMsgToServer(GsonUtils.toJson(msg))
+        LanSocketManager.sendMsgToServer(msg)
    }

    private fun initListener() {
@@ -125,13 +124,6 @@ class PM2DrivingModel private constructor() {
        TrajectoryAndDistanceManager.addDistanceListener(TAG, trajectoryListener)
    }

-    private fun sendMsgToServer(msg: String) {
-        sendMsgToServer(
-            OchCommonConst.BUSINESS_STRING,
-            GsonUtils.toJson(msg).toByteArray()
-        )
-    }
-
    fun releaseListener() {
        //自动驾驶状态监听
        CallerAutoPilotStatusListenerManager.removeListener(TAG)
--- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
+++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
@@ -32,18 +32,15 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager
-import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager.sendMsgToAllClients
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.*
-import com.mogo.och.common.module.bean.dpmsg.*
 import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager
 import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager.pushAppOperationalMsgBox
 import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager.registerSocketMessageListener
 import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager.releaseSocketMessageListener
-import com.mogo.och.common.module.biz.common.socketmessage.data.*
 import com.mogo.och.common.module.constant.OchCommonConst
 import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.common.module.biz.login.LoginStatusManager
@@ -60,6 +57,7 @@ import com.mogo.och.common.module.manager.device.LightAirconditionDoorStatusMana
 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.cloud.data.SystemMsg
+import com.mogo.och.common.module.manager.socket.lan.LanSocketManager
 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
@@ -626,10 +624,7 @@ class DriverM1Model {

    private fun sendMsgToClient(msg: BaseDPMsg?){
        d(SceneConstant.M_CHARTER_D + TAG,  "sendMsgToClient" + GsonUtils.toJson(msg))
-        sendMsgToAllClients(
-            OchCommonConst.BUSINESS_STRING,
-            GsonUtils.toJson(msg).toByteArray()
-        )
+        LanSocketManager.sendMsgToClient(msg)
    }

    fun driverEndLease() {
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt
@@ -47,6 +47,7 @@ import com.mogo.och.common.module.manager.CharterSendTripInfoManager.LEAVE_STATI
 import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager
 import com.mogo.och.common.module.manager.beautifymode.BeautifyManager
 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.utils.CoordinateCalculateRouteUtil
 import com.mogo.och.common.module.utils.DateTimeUtil
 import com.mogo.och.common.module.utils.PinYinUtil
@@ -981,10 +982,7 @@ object CharterPassengerModel {
                    OrderInfoResponse.ARRIVED,
                    currentTimeStamp
                )
-                CallerTelematicManager.sendMsgToServer(
-                    OchCommonConst.BUSINESS_STRING,
-                    GsonUtils.toJson(msg).toByteArray()
-                )
+                LanSocketManager.sendMsgToServer(msg)
                d(M_BUS_P + BaseDPMsg.TAG, "到站发送数据${msg}")
            }

--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoViewModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoViewModel.kt
@@ -2,17 +2,15 @@ package com.mogo.och.charter.passenger.ui.orderinfo

 import androidx.lifecycle.ViewModel
 import com.mogo.eagle.core.data.BaseData
-import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
 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.GsonUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.charter.passenger.callback.ITimeCallback
 import com.mogo.och.charter.passenger.model.CharterPassengerModel
 import com.mogo.och.common.module.wigets.toast.ToastCharterUtils
 import com.mogo.och.common.module.manager.socket.lan.bean.BaseDPMsg
 import com.mogo.och.common.module.manager.socket.lan.bean.EndOrderMsg
-import com.mogo.och.common.module.constant.OchCommonConst
+import com.mogo.och.common.module.manager.socket.lan.LanSocketManager
 import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.common.module.utils.DateTimeUtil

@@ -74,10 +72,7 @@ class OrderInfoViewModel: ViewModel(), ITimeCallback {
                    val msg = EndOrderMsg(
                        CharterPassengerModel.getCurrentOrderInfo()?.orderNo?:"",
                    )
-                    CallerTelematicManager.sendMsgToServer(
-                        OchCommonConst.BUSINESS_STRING,
-                        GsonUtils.toJson(msg).toByteArray()
-                    )
+                    LanSocketManager.sendMsgToServer(msg)
                    CallerLogger.d(SceneConstant.M_BUS_P + BaseDPMsg.TAG, "发送数据：结束订单${msg}")
                }
            }
--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineViewModel.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineViewModel.kt
@@ -30,6 +30,7 @@ import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.common.module.manager.stopside.StopSideManager
 import com.mogo.och.common.module.manager.loop.BizLoopManager
 import com.mogo.och.common.module.manager.loop.LoopInfo
+import com.mogo.och.common.module.manager.socket.lan.LanSocketManager
 import com.mogo.och.common.module.manager.stopside.StopSideStatus
 import com.mogo.och.common.module.utils.RxUtils
 import io.reactivex.disposables.Disposable
@@ -242,10 +243,7 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener {
                0,
                sentDataSite
            )
-            CallerTelematicManager.sendMsgToServer(
-                OchCommonConst.BUSINESS_STRING,
-                GsonUtils.toJson(msg).toByteArray()
-            )
+            LanSocketManager.sendMsgToServer(msg)
            CallerLogger.d(SceneConstant.M_BUS_P + BaseDPMsg.TAG, "发送数据：切换站点${msg}")
        }
        viewCallback?.hideDataWaitDriverMsg()
--- 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
@@ -23,11 +23,15 @@ object OchChainLogManager {
    const val EVENT_KEY_INFE_ERROR = "event_key_och_error"

    const val EVENT_KEY_INFO_Net = "event_key_och_net"
+    const val EVENT_KEY_INFO_SOCKET = "event_key_och_socket"


    fun writeChainLogNet(info: String, changeInfo: String){
        writeChainLog(info,changeInfo,true,EVENT_KEY_INFO_Net)
    }
+    fun writeChainLogLanSocket(info: String, changeInfo: String){
+        writeChainLog(info,changeInfo,true,EVENT_KEY_INFO_SOCKET)
+    }

    /**
     * @param Info 订单详细信息
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/lan/LanSocketManager.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/lan/LanSocketManager.kt
@@ -2,27 +2,28 @@ package com.mogo.och.common.module.manager.socket.lan

 import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
 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.GsonUtils
 import com.mogo.och.common.module.constant.OchCommonConst
+import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.common.module.manager.socket.lan.bean.BaseDPMsg

 object LanSocketManager {
-    private const val TAG = "LanSocket"
+    private const val TAG = "LanSocketManager"
+
+    @JvmStatic
    fun sendMsgToClient(msg: BaseDPMsg?) {
-        CallerLogger.d(SceneConstant.M_CHARTER_D + TAG, "sendMsgToClient" + GsonUtils.toJson(msg))
-        CallerTelematicManager.sendMsgToAllClients(
-            OchCommonConst.BUSINESS_STRING,
-            GsonUtils.toJson(msg).toByteArray()
-        )
+        val message = GsonUtils.toJson(msg)
+        CallerLogger.d(TAG, "sendMsgToClient: $message")
+        OchChainLogManager.writeChainLogLanSocket("发送msg到各个端",message)
+        CallerTelematicManager.sendMsgToAllClients(OchCommonConst.BUSINESS_STRING, message.toByteArray())
    }

+    @JvmStatic
    fun sendMsgToServer(msg: BaseDPMsg?) {
-        CallerLogger.d(SceneConstant.M_CHARTER_D + TAG, "sendMsgToServer" + GsonUtils.toJson(msg))
-        CallerTelematicManager.sendMsgToServer(
-            OchCommonConst.BUSINESS_STRING,
-            GsonUtils.toJson(msg).toByteArray()
-        )
+        val message = GsonUtils.toJson(msg)
+        CallerLogger.d(TAG, "sendMsgToServer:$message")
+        OchChainLogManager.writeChainLogLanSocket("发送msg到服务端(司机)",message)
+        CallerTelematicManager.sendMsgToServer(OchCommonConst.BUSINESS_STRING, message.toByteArray())
    }


--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/lan/bean/DPMsgType.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/lan/bean/DPMsgType.kt
@@ -1,5 +1,7 @@
 package com.mogo.och.common.module.manager.socket.lan.bean

+import com.mogo.eagle.core.utilcode.util.GsonUtils
+
 /**
 * @author: wangmingjun
 * @date: 2023/2/24
@@ -16,5 +18,34 @@ enum class DPMsgType(val type: Int) {
    TYPE_WRITEOFF_INFO(8), //核销信息
    TYPE_WRITEOFF_DEVICES_INFO(9), //核销设备信息
    TYPE_CHANGE_BUSINESS_TYPE(10), //业务模式切换
-    TYPE_ENV_CHECK(11) //环境核验
+    TYPE_ENV_CHECK(11); //环境核验
+
+    companion object {
+        fun getValue(type: Int, byteArray: ByteArray):BaseDPMsg? {
+            when (type) {
+                TYPE_COMMON.type -> {
+                    return  GsonUtils.fromJson(
+                        String(byteArray), AppConnectMsg::class.java
+                    ) as AppConnectMsg
+                }
+                TYPE_CHANGE_DEST.type -> {
+                    return  GsonUtils.fromJson(
+                        String(byteArray), ChangeDestMsg::class.java
+                    ) as ChangeDestMsg
+                }
+                TYPE_OPEN_CLOSE_DOOR.type -> {}
+                TYPE_ORDER_CLOSED.type -> {}
+                TYPE_TASK_DETAILS.type -> {}
+                TYPE_LOGIN_STATUS.type -> {}
+                TYPE_ARRIVEDEST_STATUS.type -> {}
+                TYPE_ORDER_CLOSED_BY_M1_STATUS.type -> {}
+                TYPE_WRITEOFF_INFO.type -> {}
+                TYPE_WRITEOFF_DEVICES_INFO.type -> {}
+                TYPE_CHANGE_BUSINESS_TYPE.type -> {}
+                TYPE_ENV_CHECK.type -> {}
+                else -> {}
+            }
+            return null
+        }
+    }
 }
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/lan/bean/DataBean.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/lan/bean/DataBean.kt
@@ -42,30 +42,10 @@ data class LineSite(
    val type: Int?,
 )

-data class ArriveDestMsg(
-    var orderNo: String, //订单id
-    var lineId: Int, //线路id
-    var lineName: String = "", //线路名称
-    var startSiteId: Int = 0,  //当前站点
-    var startSiteName: String = "",
-    var destSiteId: Int = 0, //目的地
-    var destSiteName: String = "",
-    var arriveStatus: Int?, //1:未到达 2:到达
-    var writtenVersion: Long?, //版本标记
-) : BaseDPMsg(DPMsgType.TYPE_ARRIVEDEST_STATUS.type)
-
 data class EndOrderMsg(
    var orderNo: String, //订单id
 ) : BaseDPMsg(DPMsgType.TYPE_ORDER_CLOSED_BY_M1_STATUS.type)

-data class DPCommonOperationMsg(
-    var msg: String
-) : BaseDPMsg(DPMsgType.TYPE_COMMON.type)
-
-data class DPOperateDoorMsg(
-    var open: Boolean = false // true: 开门， false: 关门
-) : BaseDPMsg(DPMsgType.TYPE_OPEN_CLOSE_DOOR.type)
-
 data class DPOrderClosedMsg(
    var closed: Boolean = true // true: 结束
 ) : BaseDPMsg(DPMsgType.TYPE_ORDER_CLOSED.type)
--- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java
+++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java
@@ -20,6 +20,7 @@ import com.mogo.eagle.core.data.BaseData;
 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
 import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.data.map.MogoLocation;
+import com.mogo.och.common.module.manager.socket.lan.LanSocketManager;
 import com.mogo.och.shuttle.bean.BusRoutesResponse;
 import com.mogo.och.shuttle.util.ShuttleVoiceManager;
 import com.mogo.och.common.module.manager.socket.lan.bean.AppConnectMsg;
@@ -231,8 +232,7 @@ public class OrderModel {

                    if (list != null && list.contains(2)){ //乘客屏
                        AppConnectMsg msg = new AppConnectMsg(true,false,obj.getContext(),-1);
-                        CallerTelematicManager.INSTANCE.sendMsgToAllClients(OchCommonConst.BUSINESS_STRING,
-                                GsonUtils.toJson(msg).getBytes());
+                        LanSocketManager.sendMsgToClient(msg);
                    }

                }
@@ -726,8 +726,7 @@ public class OrderModel {
        BusTransferData data = new BusTransferData(LoginStatusManager.isLogin() ? 1:0,busRoutesResult);
        TaskDetailsMsg msg = new TaskDetailsMsg(GsonUtils.toJson(data));
        CallerLogger.d(M_BUS + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(msg));
-        CallerTelematicManager.INSTANCE.sendMsgToAllClients(OchCommonConst.BUSINESS_STRING,
-                GsonUtils.toJson(msg).getBytes());
+        LanSocketManager.sendMsgToClient(msg);
    }

    private void pushCacheTransferData(BusRoutesResult result) {
@@ -742,8 +741,7 @@ public class OrderModel {
        AppConnectMsg arrivedMsg = new AppConnectMsg(false,true,String.format(mContext
                        .getString(R.string.bus_arrived_station_tip),
                arriveStation),-1);
-        CallerTelematicManager.INSTANCE.sendMsgToAllClients(OchCommonConst.BUSINESS_STRING,
-                GsonUtils.toJson(arrivedMsg).getBytes());
+        LanSocketManager.sendMsgToClient(arrivedMsg);
    }

    private void sendStartStationToClient(String nextStation) {
@@ -751,24 +749,18 @@ public class OrderModel {
                        .getString(R.string.bus_leave_station_tip),
                nextStation),-1);

-        UiThreadHandler.postDelayed(()->
-                CallerTelematicManager.INSTANCE.sendMsgToAllClients(OchCommonConst.BUSINESS_STRING,
-                GsonUtils.toJson(startMsg).getBytes()),DELAY_10S);
+        UiThreadHandler.postDelayed(()-> LanSocketManager.sendMsgToClient(startMsg),DELAY_10S);
    }

    private void sendEndTaskToClient() {
        AppConnectMsg endMsg = new AppConnectMsg(false,true,mContext
                .getString(R.string.bus_end_task_tip),-1);
-
-        CallerTelematicManager.INSTANCE.sendMsgToAllClients(OchCommonConst.BUSINESS_STRING,
-                GsonUtils.toJson(endMsg).getBytes());
+        LanSocketManager.sendMsgToClient(endMsg);
    }

    public void sendWriteOffNumToClient(String msg){
        AppConnectMsg passengerMsg = new AppConnectMsg(false,true,msg,-1);
-
-        CallerTelematicManager.INSTANCE.sendMsgToAllClients(OchCommonConst.BUSINESS_STRING,
-                GsonUtils.toJson(passengerMsg).getBytes());
+        LanSocketManager.sendMsgToClient(passengerMsg);
    }

    /**
--- a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerManager.kt
+++ b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/manager/scnner/ScannerManager.kt
@@ -14,6 +14,7 @@ import com.mogo.eagle.core.utilcode.util.StringUtils
 import com.mogo.och.common.module.manager.socket.lan.bean.WriteOffDevicesMsg
 import com.mogo.och.common.module.manager.socket.lan.bean.WriteOffMsg
 import com.mogo.och.common.module.constant.OchCommonConst
+import com.mogo.och.common.module.manager.socket.lan.LanSocketManager
 import com.mogo.support.serialport.client.SerialPortManager
 import com.mogo.support.serialport.client.SerialPortManager.SERVICE_STATE
 import com.mogo.support.serialport.client.listener.OnDeviceVerificationListener
@@ -188,10 +189,7 @@ object ScannerManager : OnSerialPortListener, OnDeviceVerificationListener(), IR
        val msg = WriteOffDevicesMsg(isConnectScanner, message)
        CallerLogger.d(M_BUS_P + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(msg))
        if(driverSn.isNotEmpty()) {
-            CallerTelematicManager.sendMsgToServer(
-                OchCommonConst.BUSINESS_STRING,
-                GsonUtils.toJson(msg).toByteArray()
-            )
+            LanSocketManager.sendMsgToServer(msg)
        }
    }

@@ -201,10 +199,7 @@ object ScannerManager : OnSerialPortListener, OnDeviceVerificationListener(), IR
    private fun sendMessage2DriverWriteOffInfo(message:String){
        val msg = WriteOffMsg(false, "", 0, "", message,"")
        CallerLogger.d(M_BUS_P + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(msg))
-        CallerTelematicManager.sendMsgToServer(
-            OchCommonConst.BUSINESS_STRING,
-            GsonUtils.toJson(msg).toByteArray()
-        )
+        LanSocketManager.sendMsgToServer(msg)
    }

    override fun onReceivedMsg(type: Int, byteArray: ByteArray) {
--- a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/model/TicketModel.kt
+++ b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/model/TicketModel.kt
@@ -1,12 +1,11 @@
 package com.mogo.och.shuttle.passenger.model

 import com.mogo.commons.AbsMogoApplication
-import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS_P
 import com.mogo.eagle.core.utilcode.util.GsonUtils
 import com.mogo.och.common.module.manager.socket.lan.bean.WriteOffMsg
-import com.mogo.och.common.module.constant.OchCommonConst
+import com.mogo.och.common.module.manager.socket.lan.LanSocketManager
 import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.shuttle.passenger.bean.request.PassengerWriteOffRequest
 import com.mogo.och.shuttle.passenger.bean.response.PassengerWriteOffResponse
@@ -90,19 +89,13 @@ object TicketModel : StateChangeListener {
    private fun sendMessage2Driver(message:String){
        val msg = WriteOffMsg(false, "", 0, "", message,"")
        CallerLogger.d(M_BUS_P + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(msg))
-        CallerTelematicManager.sendMsgToServer(
-            OchCommonConst.BUSINESS_STRING,
-            GsonUtils.toJson(msg).toByteArray()
-        )
+        LanSocketManager.sendMsgToServer(msg)
        ScannerChainLogManager.writeChainLog(TAG +"sendMessage2Driver","核验失败：message:${message}")
    }
    private fun sendMessage2DriverSuccess(message: PassengerWriteOffResponse.Result,orderNo: String){
        val msg = WriteOffMsg(true, message.phone, message.ticketSize, message.ticketName, "",orderNo)
        CallerLogger.d(M_BUS_P + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(msg))
-        CallerTelematicManager.sendMsgToServer(
-            OchCommonConst.BUSINESS_STRING,
-            GsonUtils.toJson(msg).toByteArray()
-        )
+        LanSocketManager.sendMsgToServer(msg)
        ScannerChainLogManager.writeChainLog(TAG +"sendMessage2DriverSuccess","核验成功：message:${message}")
    }

--- a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java
+++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java
@@ -28,6 +28,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant;
 import com.mogo.eagle.core.utilcode.util.GsonUtils;
 import com.mogo.eagle.core.utilcode.util.StringUtils;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
+import com.mogo.och.common.module.manager.socket.lan.LanSocketManager;
 import com.mogo.och.common.module.voice.VoiceNotice;
 import com.mogo.och.shuttle.passenger.R;
 import com.mogo.och.common.module.manager.socket.lan.bean.AppConnectMsg;
@@ -144,7 +145,7 @@ public class BusPassengerModel {
        //本地去请求司机端
        TaskDetailsMsg msg = new TaskDetailsMsg("task");

-        sendMsgToServer(GsonUtils.toJson(msg));
+        LanSocketManager.sendMsgToServer(msg);
    }

    public void setDriverStatusCallback(IBusPassegerDriverStatusCallback callback){
@@ -159,13 +160,6 @@ public class BusPassengerModel {
        handler.sendEmptyMessageDelayed( MSG_QUERY_BUS_P_STATION, QUERY_BUS_P_STATION_DELAY );
    }

-    private void sendMsgToServer(String msg){
-        CallerTelematicManager.INSTANCE.sendMsgToServer(
-                OchCommonConst.BUSINESS_STRING,
-                msg.getBytes()
-        );
-    }
-
    private void queryDriverOperationStatus() {
        PassengerServiceManager.queryDriverOperationStatus(mContext
                , new OchCommonServiceCallback<PassengerOperationStatusResponse>() {
--- a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2DrivingModel.kt
+++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2DrivingModel.kt
@@ -20,7 +20,6 @@ import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager
-import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager.sendMsgToServer
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger
@@ -29,7 +28,6 @@ import com.mogo.eagle.core.utilcode.util.GsonUtils
 import com.mogo.eagle.core.utilcode.util.NetworkUtils
 import com.mogo.eagle.core.utilcode.util.StringUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
-import com.mogo.och.common.module.bean.dpmsg.*
 import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager.pushAppOperationalMsgBox
 import com.mogo.och.common.module.constant.OchCommonConst
 import com.mogo.och.common.module.network.OchCommonServiceCallback
@@ -37,6 +35,7 @@ import com.mogo.och.common.module.manager.distance.IDistanceListener
 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.loop.LoopInfo
+import com.mogo.och.common.module.manager.socket.lan.LanSocketManager
 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.DPMsgType
@@ -103,7 +102,7 @@ class PM2DrivingModel private constructor() {
    private fun queryDriverByLocalDriver() {
        //本地去请求司机端
        val msg = TaskDetailsMsg("task")
-        sendMsgToServer(GsonUtils.toJson(msg))
+        LanSocketManager.sendMsgToServer(msg)
    }

    private fun initListener() {
@@ -124,13 +123,6 @@ class PM2DrivingModel private constructor() {

    }

-    private fun sendMsgToServer(msg: String) {
-        sendMsgToServer(
-            OchCommonConst.BUSINESS_STRING,
-            GsonUtils.toJson(msg).toByteArray()
-        )
-    }
-
    fun releaseListener() {
        //自动驾驶状态监听
        CallerAutoPilotStatusListenerManager.removeListener(TAG)