[6.4.0]

[局域网内网络通讯]

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) {

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}")
     }
 

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>() {

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)