From 82be9db9abeea32c65a8d75634edfeaa43f3f936 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Mon, 21 Aug 2023 14:02:56 +0800 Subject: [PATCH] =?UTF-8?q?[6.0.0]=201=E3=80=81=E8=BD=A8=E8=BF=B9=E9=A2=84?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/taxi/utils/TaxiTrajectoryManager.java | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java index 8845d37e68..ef3287ad56 100644 --- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java +++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java @@ -133,9 +133,6 @@ public class TaxiTrajectoryManager { if (curTaskContrail == null) return; long curLineId = taskAndOrder.getLineId(); - final List orderContrails = TaxiModel.INSTANCE.getCurOrderContrails(); - final OrderDetail orderDetail = taskAndOrder.getOrder(); - ContrailListRespBean.Result preloadContrail = null; //预加载的轨迹 if (mAutoPilotLine == null) { mAutoPilotLine = new AutopilotControlParameters.AutoPilotLine(curTaskContrail.getLineId(), curTaskContrail.getLineName(), @@ -144,7 +141,7 @@ public class TaxiTrajectoryManager { curTaskContrail.getCsvFileUrlDPQP(), curTaskContrail.getCsvFileMd5DPQP(), curTaskContrail.getTxtFileUrlDPQP(), curTaskContrail.getTxtFileMd5DPQP(), curTaskContrail.getContrailSaveTimeDPQP()); } else { - mAutoPilotLine.setLineId(taskAndOrder.getLineId()); + mAutoPilotLine.setLineId(curTaskContrail.getLineId()); mAutoPilotLine.setLineName(curTaskContrail.getLineName()); mAutoPilotLine.setTrajUrl(curTaskContrail.getCsvFileUrl()); mAutoPilotLine.setTrajMd5(curTaskContrail.getCsvFileMd5()); @@ -159,13 +156,21 @@ public class TaxiTrajectoryManager { mAutoPilotLine.setTimestamp_dpqp(curTaskContrail.getContrailSaveTimeDPQP()); } + final OrderDetail orderDetail = taskAndOrder.getOrder(); + ContrailListRespBean.Result preloadContrail = null; //预加载的轨迹 + final List orderContrails = TaxiModel.INSTANCE.getCurOrderContrails(); + if (orderDetail != null && orderContrails != null && orderContrails.size() != 0 ){ - if (orderContrails.contains(curLineId)){ //预加载轨迹是curLineId索引的下一个 - int index = orderContrails.indexOf(curLineId); - if (orderContrails.size()-1 >= index){ - preloadContrail = orderContrails.get(index); + for (int i = 0; i< orderContrails.size() ; i++){ + if (orderContrails.get(i).getLineId() == curLineId){ //预加载轨迹是curLineId索引的下一个 + int index = i + 1; + if (orderContrails.size()-1 >= index){ + preloadContrail = orderContrails.get(index); + } } - }else {//预加载轨迹直接是集合第一个 + } + if (preloadContrail == null){ + //不包含预加载轨迹直接是集合第一个 preloadContrail = orderContrails.get(0); } } @@ -179,7 +184,7 @@ public class TaxiTrajectoryManager { preloadContrail.getCsvFileUrlDPQP(), preloadContrail.getCsvFileMd5DPQP(), preloadContrail.getTxtFileUrlDPQP(), preloadContrail.getTxtFileMd5DPQP(), preloadContrail.getContrailSaveTimeDPQP()); } else { - mPreAutoPilotLine.setLineId(taskAndOrder.getLineId()); + mPreAutoPilotLine.setLineId(preloadContrail.getLineId()); mPreAutoPilotLine.setLineName(preloadContrail.getLineName()); mPreAutoPilotLine.setTrajUrl(preloadContrail.getCsvFileUrl()); mPreAutoPilotLine.setTrajMd5(preloadContrail.getCsvFileMd5()); @@ -275,6 +280,6 @@ public class TaxiTrajectoryManager { } CallerLogger.INSTANCE.d(M_TAXI + TAG, "sendTrajectoryReq(): common_load = " - + GsonUtils.toJson(mAutoPilotLine) + "pre_load" + GsonUtils.toJson(mPreAutoPilotLine)); + + GsonUtils.toJson(mAutoPilotLine) + ", pre_load" + GsonUtils.toJson(mPreAutoPilotLine)); } }