From d313ac52b9214c6bd19e28187e568e21c6550b1f Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Fri, 17 Mar 2023 23:36:21 +0800 Subject: [PATCH] =?UTF-8?q?[shuttle/M1]=201=E3=80=81=E5=A4=84=E7=90=86?= =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=B6=88=E6=81=AF=E5=8D=95=E5=8F=91=E4=B9=98?= =?UTF-8?q?=E5=AE=A2=E5=B1=8Fbug=20=202=E3=80=81=E7=AB=99=E7=82=B9?= =?UTF-8?q?=E6=96=87=E6=A1=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/bus/model/OrderModel.java | 12 +++++++----- .../magic/mogo/och/charter/model/DriverM1Model.kt | 15 +++++++++------ .../src/main/res/values/strings.xml | 2 +- .../biz/common/socketmessage/data/SystemMsg.kt | 2 +- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java b/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java index 42f1e48fee..bc2f8186b1 100644 --- a/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java +++ b/OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/model/OrderModel.java @@ -231,16 +231,18 @@ public class OrderModel { CallerLogger.INSTANCE.i(M_BUS + TAG,"onMsgReceived = "+obj.getContext()); List list = obj.getScreenList(); CallerLogger.INSTANCE.i(M_BUS + TAG,"onMsgReceived = "+GsonUtils.toJson(list)); - if ( list!= null && list.size() > 1){ + + if (list != null && list.contains(1)){ // 1司机端 + OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(DateTimeUtil.getCurrentTimeStamp(), + obj.getContext(),OCHSocketMessageManager.OPERATION_SYSTEM); + } + + if (list != null && list.contains(2)){ //乘客屏 AppConnectMsg msg = new AppConnectMsg(true,false,obj.getContext()); CallerTelematicManager.INSTANCE.sendMsgToAllClients(OchCommonConst.BUSINESS_STRING, GsonUtils.toJson(msg).getBytes()); } - OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(DateTimeUtil.getCurrentTimeStamp(), - obj.getContext(),OCHSocketMessageManager.OPERATION_SYSTEM); - - } }; diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt index 55e296f75e..3a99ad95a6 100644 --- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt +++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt @@ -16,10 +16,6 @@ import com.magic.mogo.och.charter.callback.DriverM1OrderCallback import com.magic.mogo.och.charter.callback.IDriverM1ControllerStatusCallback import com.magic.mogo.och.charter.constant.CharterConst import com.magic.mogo.och.charter.manager.CharterAnalyticsManager -import com.mogo.och.common.module.manager.CharterSendTripInfoManager -import com.mogo.och.common.module.manager.CharterSendTripInfoManager.ARRIVE_STATION -import com.mogo.och.common.module.manager.CharterSendTripInfoManager.END_TRIP -import com.mogo.och.common.module.manager.CharterSendTripInfoManager.START_TRIP import com.magic.mogo.och.charter.manager.CharterTrajectoryManager import com.magic.mogo.och.charter.net.DriverM1ServiceManager import com.mogo.aicloud.services.socket.IMogoOnMessageListener @@ -50,6 +46,10 @@ import com.mogo.och.common.module.biz.provider.LoginService import com.mogo.och.common.module.callback.OchAdasStartFailureCallback import com.mogo.och.common.module.manager.AbnormalFactorsLoopManager.startLoopAbnormalFactors import com.mogo.och.common.module.manager.AbnormalFactorsLoopManager.stopLoopAbnormalFactors +import com.mogo.och.common.module.manager.CharterSendTripInfoManager +import com.mogo.och.common.module.manager.CharterSendTripInfoManager.ARRIVE_STATION +import com.mogo.och.common.module.manager.CharterSendTripInfoManager.END_TRIP +import com.mogo.och.common.module.manager.CharterSendTripInfoManager.START_TRIP import com.mogo.och.common.module.manager.OCHAdasAbilityManager import com.mogo.och.common.module.utils.* import io.reactivex.exceptions.UndeliverableException @@ -252,9 +252,12 @@ class DriverM1Model { d(SceneConstant.M_CHARTER_D + TAG, "onMsgReceived = " + obj.context) - pushOperationalToMsgBox(obj.pushTimeStamp, obj.context) val list = obj.screenList - if (list.size > 1){ //发送乘客屏 + d(SceneConstant.M_CHARTER_D + TAG, "onMsgReceived = " + GsonUtils.toJson(list)) + if (list != null && list.contains(1)){ // 司机端 + pushOperationalToMsgBox(obj.pushTimeStamp, obj.context) + } + if (list != null && list.contains(2)){ //发送乘客屏 sendMsgToClient(DPCommonOperationMsg(obj.context)) } diff --git a/OCH/mogo-och-charter/src/main/res/values/strings.xml b/OCH/mogo-och-charter/src/main/res/values/strings.xml index 47ca830c1c..46f95b6556 100644 --- a/OCH/mogo-och-charter/src/main/res/values/strings.xml +++ b/OCH/mogo-och-charter/src/main/res/values/strings.xml @@ -26,7 +26,7 @@ 起点： 终点： - 当前站点： + 出发站点： 目的站点： 下一站： 自动驾驶状态为0不可用 diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/SystemMsg.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/SystemMsg.kt index b30bef39a2..f321b2c108 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/SystemMsg.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/SystemMsg.kt @@ -5,7 +5,7 @@ package com.mogo.och.common.module.biz.common.socketmessage.data */ data class SystemMsg( var context: String, - var screenList: MutableList, + var screenList: MutableList,//1:司机屏 2:乘客屏 var pushTimeStamp: Long = System.currentTimeMillis() // 消息下发时间戳 )