[6.4.4]

[bus 弱网优化]

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<TaskDetailsMsg>(){
+        @Override
+        public Class<TaskDetailsMsg> target() {
+            return TaskDetailsMsg.class;
+        }
+
+        @Override
+        public void onMsgReceived(TaskDetailsMsg obj) {
+            sendTaskDetailsToClients();
+        }
+    };
+
+
 
     private final ITrajectoryListListener iTrajectoryListener = new ITrajectoryListListener() {
 

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

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

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(

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<EnvCheck> {
             override fun target(): Class<EnvCheck> {
                 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())
     }
 
 

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

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

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