From 21ac2f8f4a02980f5b9158f531147346a6f266d0 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Fri, 31 Mar 2023 20:47:19 +0800 Subject: [PATCH] =?UTF-8?q?[shuttle-B1/B2]=20=E5=BC=B1=E7=BD=91=E8=B0=83?= =?UTF-8?q?=E8=AF=95=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/common/module/bean/dpmsg/DataBean.kt | 2 +- .../com/mogo/och/data/bean/BusTransferData.kt | 2 +- .../bus/passenger/model/BusPassengerModel.java | 4 ++-- .../och/bus/passenger/model/PM2DrivingModel.kt | 15 +++++++++++++++ .../java/com/mogo/och/bus/model/OrderModel.java | 5 +++-- 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt index a73d7e0756..2fae88bbb1 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt @@ -42,5 +42,5 @@ data class AppConnectMsg(var isViewShow: Boolean, var isPlay: Boolean, var msg: ): BaseDPMsg(DPMsgType.TYPE_COMMON.type) data class TaskDetailsMsg( - var msg: String, + var msg: String?, ): BaseDPMsg(DPMsgType.TYPE_TASK_DETAILS.type) diff --git a/OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusTransferData.kt b/OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusTransferData.kt index 264db19226..eca93d7588 100644 --- a/OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusTransferData.kt +++ b/OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusTransferData.kt @@ -5,5 +5,5 @@ package com.mogo.och.data.bean */ data class BusTransferData ( var loginStatus: Int, - var routesResult: BusRoutesResult, + var routesResult: BusRoutesResult?, ) \ No newline at end of file diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java index 6d35f14118..d2ddb289c9 100644 --- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java +++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java @@ -139,7 +139,7 @@ public class BusPassengerModel { private void queryDriverByLocalDriver() { //本地去请求司机端 - TaskDetailsMsg msg = new TaskDetailsMsg(""); + TaskDetailsMsg msg = new TaskDetailsMsg("task"); sendMsgToServer(GsonUtils.toJson(msg)); } @@ -167,7 +167,7 @@ public class BusPassengerModel { private void sendMsgToServer(String msg){ CallerTelematicManager.INSTANCE.sendMsgToServer( OchCommonConst.BUSINESS_STRING, - GsonUtils.toJson(msg).getBytes() + msg.getBytes() ); } diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt index 11f8af010d..7da2122640 100644 --- a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt +++ b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt @@ -376,6 +376,15 @@ class PM2DrivingModel private constructor() { updatePassengerRouteInfo(data.result) } + fun onError() { + CallerLogger.d( + SceneConstant.Companion.M_BUS_P + TAG, + "queryDriverSiteByCoordinate = onError =" + + ", sn = " + BusPassengerServiceManager.driverAppSn + ) + queryDriverByLocalDriver() + } + override fun onFail(code: Int, msg: String?) { d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate = %s", msg) if (code == 1003){ @@ -405,6 +414,12 @@ class PM2DrivingModel private constructor() { } private fun updatePassengerRouteInfo(result: BusRoutesResult) { + + if (result == null) { + clearLocalRouteResult() + return + } + mDrivingInfoCallback?.updateLine(result.name, result.runningDur) if (result.sites != null) { mDrivingInfoCallback?.showNoTaskView(false) diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java index 454bb0a761..be4cecf5e1 100644 --- a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java +++ b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java @@ -819,7 +819,8 @@ public class OrderModel { } private void sendTaskDetailsToClients() { - BusTransferData data = new BusTransferData(LoginStatusManager.getLoginStatus().getCode(),busRoutesResult); + + BusTransferData data = new BusTransferData(LoginStatusManager.isLogin() ? 1:0,busRoutesResult); TaskDetailsMsg msg = new TaskDetailsMsg(GsonUtils.toJson(data)); CallerLogger.INSTANCE.d(M_BUS + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(msg)); CallerTelematicManager.INSTANCE.sendMsgToAllClients(OchCommonConst.BUSINESS_STRING, @@ -827,7 +828,7 @@ public class OrderModel { } private void pushCacheTransferData(BusRoutesResult result) { - BusTransferData data = new BusTransferData(LoginStatusManager.getLoginStatus().getCode(),result); + BusTransferData data = new BusTransferData(LoginStatusManager.isLogin() ? 1:0,result); CacheDataManager.Companion.getInstance().putCacheData(mContext, BusCacheKey.BUS_LINE_CACHE, GsonUtils.toJson(data));