From b4e105602cb9bbf113b704bd6f7d4f5ae3a062f9 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 3 Jun 2024 16:47:17 +0800 Subject: [PATCH] =?UTF-8?q?[6.4.4]=20[bus=20=E5=BC=B1=E7=BD=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/bus/model/OrderModel.java | 19 ++++++++++++++++++- .../och/bus/passenger/model/OrderModel.kt | 3 ++- .../module/biz/login/LoginStatusManager.kt | 1 - .../manager/socket/lan/bean/DataBean.kt | 2 +- .../mogo/och/common/module/ExampleUnitTest.kt | 9 +++++---- .../mogo/och/shuttle/model/OrderModel.java | 4 ++-- .../passenger/model/BusPassengerModel.java | 3 ++- .../passenger/model/PM2DrivingModel.kt | 3 ++- 8 files changed, 32 insertions(+), 12 deletions(-) diff --git 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 index 4d52da2627..41484f0972 100644 --- 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 @@ -48,12 +48,15 @@ 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; +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.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; +import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType; import com.mogo.och.common.module.manager.socket.lan.bean.LoginCacheStatus; import com.mogo.och.common.module.manager.socket.lan.bean.TaskDetailsMsg; import com.mogo.och.common.module.network.OchCommonServiceCallback; @@ -157,6 +160,7 @@ public class OrderModel { AbnormalFactorsLoopManager.INSTANCE.startLoopAbnormalFactors(mContext); TrajectoryAndDistanceManager.INSTANCE.addTrajectoryListener(TAG,trajectoryListener); + LanSocketManager.INSTANCE.registerSocketMessageListener(DPMsgType.TYPE_TASK_DETAILS.getType(),taskDetailsMsgListener); //2022.1.28 // 调用Disposable.dispose() 时候会出现InterruptedException 导致出现崩溃 @@ -222,7 +226,7 @@ public class OrderModel { private void sendTaskDetailsToClients() { BusTransferData data = new BusTransferData(LoginStatusManager.isLogin() ? 1:0,busRoutesResult); - TaskDetailsMsg msg = new TaskDetailsMsg(GsonUtils.toJson(data)); + TaskDetailsMsg msg = new TaskDetailsMsg(GsonUtils.toJson(data), BusinessType.bus); CallerLogger.d(M_BUS + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(msg)); LanSocketManager.sendMsgToClient(msg); } @@ -333,6 +337,19 @@ public class OrderModel { }; + private final ILanMessageListener taskDetailsMsgListener = new ILanMessageListener(){ + @Override + public Class target() { + return TaskDetailsMsg.class; + } + + @Override + public void onMsgReceived(TaskDetailsMsg obj) { + sendTaskDetailsToClients(); + } + }; + + private final ITrajectoryListListener iTrajectoryListener = new ITrajectoryListListener() { diff --git a/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderModel.kt b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderModel.kt index de890e01e5..99200a7896 100644 --- a/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderModel.kt +++ b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderModel.kt @@ -36,6 +36,7 @@ import com.mogo.och.common.module.manager.loop.LoopInfo import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager 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.bean.BusinessType import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType import com.mogo.och.common.module.manager.socket.lan.bean.TaskDetailsMsg import com.mogo.och.common.module.network.OchCommonServiceCallback @@ -207,7 +208,7 @@ object OrderModel { fun queryDriverByLocalDriver() { //本地去请求司机端 - val msg = TaskDetailsMsg("task") + val msg = TaskDetailsMsg("task", BusinessType.bus) LanSocketManager.sendMsgToServer(msg) } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginStatusManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginStatusManager.kt index 2a66c6b27e..4acc1d99f0 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginStatusManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginStatusManager.kt @@ -9,7 +9,6 @@ import com.mogo.och.common.module.manager.loop.LoopInfo import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType import com.mogo.och.common.module.manager.socket.lan.bean.EnvType import com.mogo.och.common.module.manager.socket.lan.bean.ProjectType -import com.mogo.och.common.module.manager.socket.lan.bean.TaskDetailsMsg import com.mogo.och.common.module.manager.socket.lan.bean.VehicleType import com.mogo.och.common.module.utils.CallerBase import io.reactivex.schedulers.Schedulers diff --git 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 index f13ecc3230..25e9b815a5 100644 --- 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 @@ -58,7 +58,7 @@ data class AppConnectMsg( ) : BaseDPMsg(DPMsgType.TYPE_COMMON.type) data class TaskDetailsMsg( - var msg: String?, + var msg: String?,var businessType:BusinessType ) : BaseDPMsg(DPMsgType.TYPE_TASK_DETAILS.type) data class WriteOffMsg( diff --git a/OCH/common/common/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt b/OCH/common/common/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt index e7fb14f849..fdfb5f189e 100644 --- a/OCH/common/common/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt +++ b/OCH/common/common/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt @@ -8,7 +8,8 @@ import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager import com.mogo.och.common.module.manager.socket.lan.ILanMessageListener -import com.mogo.och.common.module.manager.socket.lan.LanSocketManagerJava +import com.mogo.och.common.module.manager.socket.lan.LanSocketManager +import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType import com.mogo.och.common.module.manager.socket.lan.bean.EnvCheck import com.mogo.och.common.module.manager.socket.lan.bean.TaskDetailsMsg import com.mogo.och.common.module.utils.DateTimeUtil @@ -79,7 +80,7 @@ class ExampleUnitTest { @Test fun testLanSocketManager(){ - LanSocketManagerJava.getInstance().registerSocketMessageListener(4,object : + LanSocketManager.registerSocketMessageListener(4,object : ILanMessageListener { override fun target(): Class { return EnvCheck::class.java @@ -89,9 +90,9 @@ class ExampleUnitTest { println(obj) } }) - val envCheck = TaskDetailsMsg("name") + val envCheck = TaskDetailsMsg("name", BusinessType.bus) val message = GsonUtils.toJson(envCheck) - LanSocketManagerJava.getInstance().onReceivedMsg(100,message.toByteArray()) + LanSocketManager.onReceivedMsg(100,message.toByteArray()) } diff --git 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 index 0e86c5e4a9..0d5b1691a4 100644 --- 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 @@ -26,6 +26,7 @@ import com.mogo.eagle.core.utilcode.util.StringUtils; import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager; import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager; import com.mogo.och.common.module.manager.socket.lan.LanSocketManager; +import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType; import com.mogo.och.common.module.voice.VoiceNotice; import com.mogo.och.shuttle.bean.BusRoutesResponse; import com.mogo.och.shuttle.util.ShuttleVoiceManager; @@ -47,7 +48,6 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Liste import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager; 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.CallerTelematicManager; 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; @@ -779,7 +779,7 @@ public class OrderModel { private void sendTaskDetailsToClients() { BusTransferData data = new BusTransferData(LoginStatusManager.isLogin() ? 1:0,busRoutesResult); - TaskDetailsMsg msg = new TaskDetailsMsg(GsonUtils.toJson(data)); + TaskDetailsMsg msg = new TaskDetailsMsg(GsonUtils.toJson(data), BusinessType.shuttle); CallerLogger.d(M_BUS + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(msg)); LanSocketManager.sendMsgToClient(msg); } diff --git 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 index 9a3d1c4570..e923f1a3bc 100644 --- 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 @@ -27,6 +27,7 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener; import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager; import com.mogo.och.common.module.manager.socket.lan.LanSocketManager; +import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType; 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; @@ -120,7 +121,7 @@ public class BusPassengerModel { private void queryDriverByLocalDriver() { //本地去请求司机端 - TaskDetailsMsg msg = new TaskDetailsMsg("task"); + TaskDetailsMsg msg = new TaskDetailsMsg("task", BusinessType.shuttle); LanSocketManager.sendMsgToServer(msg); } diff --git 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 index 08d597b968..427f4eb0f5 100644 --- 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 @@ -40,6 +40,7 @@ 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.BusinessType import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType import com.mogo.och.common.module.manager.socket.lan.bean.TaskDetailsMsg import com.mogo.och.common.module.utils.DateTimeUtil @@ -103,7 +104,7 @@ class PM2DrivingModel private constructor() { private fun queryDriverByLocalDriver() { //本地去请求司机端 - val msg = TaskDetailsMsg("task") + val msg = TaskDetailsMsg("task", BusinessType.shuttle) LanSocketManager.sendMsgToServer(msg) }