yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.4.4]

Browse Source 
[bus 弱网优化]
This commit is contained in:
yangyakun
2024-06-03 16:47:17 +08:00
parent 8a5b9ee574
commit b4e105602c
8 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderModel.kt
View File

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