From d7080a4cb709bff95a19707eea9327faa1ac6606 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 15 Mar 2023 16:43:09 +0800 Subject: [PATCH] =?UTF-8?q?[M1]=20=E4=B9=98=E5=AE=A2=E5=B1=8F=E5=87=BA?= =?UTF-8?q?=E7=AB=99=E4=BC=A0=E9=80=92=E7=BB=99=E5=89=8D=E5=90=8E=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bus/passenger/bean/response/OrderInfoResponse.kt | 2 ++ .../och/bus/passenger/model/CharterPassengerModel.kt | 10 ++++++++++ .../presenter/BusPassengerFunctionDevicePresenter.kt | 1 + .../com/magic/mogo/och/charter/model/DriverM1Model.kt | 8 ++++---- .../module}/manager/CharterSendTripInfoManager.kt | 2 +- 5 files changed, 18 insertions(+), 5 deletions(-) rename OCH/{mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter => mogo-och-common-module/src/main/java/com/mogo/och/common/module}/manager/CharterSendTripInfoManager.kt (97%) diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt index f384ac23e6..2aaeba7225 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/bean/response/OrderInfoResponse.kt @@ -12,6 +12,8 @@ data class OrderInfoResponse(val data: OrderInfo?) : BaseData() { val productType: Int?,//车辆类型 val lineId: Long?,//线路id val lineName: String?,//线路名称 + var startSiteId: Int?, + var startSiteName: String?, val siteId: Long?,//站点id val siteName: String?,//站点名称 val wgs84Lat: Double?, diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt index 2c877e78c9..069d3c0f7c 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt @@ -39,6 +39,8 @@ import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManag import com.mogo.och.common.module.biz.constant.LoginStatusManager import com.mogo.och.common.module.biz.constant.TaxiLoginStatusEnum import com.mogo.och.common.module.biz.network.OchCommonServiceCallback +import com.mogo.och.common.module.manager.CharterSendTripInfoManager +import com.mogo.och.common.module.manager.CharterSendTripInfoManager.LEAVE_STATION import com.mogo.och.common.module.manager.OCHAdasAbilityManager import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil import com.mogo.och.common.module.utils.DateTimeUtil @@ -887,4 +889,12 @@ object CharterPassengerModel { } return parameters } + + fun sendTripInfo() { + //发送前后屏出站消息 3：代表出站 + orderInfo?.let { + CharterSendTripInfoManager.sendCharterTripInfo(LEAVE_STATION, + it.lineName!!,it.startSiteName!!,it.siteName!!,false) + } + } } \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt index d025dd0382..384f7758d8 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionDevicePresenter.kt @@ -125,6 +125,7 @@ class BusPassengerFunctionDevicePresenter(view: M1DeviceFragment?) : CallerAutoPilotControlManager.sendPlanningCmd(2) CharterPassengerModel.startAutopilot() CharterPassengerModel.leaveStation() + CharterPassengerModel.sendTripInfo() } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> { // 重新起步 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 2a2c92ca72..55e296f75e 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,10 @@ 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.magic.mogo.och.charter.manager.CharterSendTripInfoManager -import com.magic.mogo.och.charter.manager.CharterSendTripInfoManager.ARRIVE_STATION -import com.magic.mogo.och.charter.manager.CharterSendTripInfoManager.END_TRIP -import com.magic.mogo.och.charter.manager.CharterSendTripInfoManager.START_TRIP +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 diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterSendTripInfoManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/CharterSendTripInfoManager.kt similarity index 97% rename from OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterSendTripInfoManager.kt rename to OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/CharterSendTripInfoManager.kt index a3efae98a1..baf9fa9afb 100644 --- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterSendTripInfoManager.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/CharterSendTripInfoManager.kt @@ -1,4 +1,4 @@ -package com.magic.mogo.och.charter.manager +package com.mogo.och.common.module.manager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d