From 1ca70491a75dd860184fc54796c0b388da69372d Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 4 Aug 2022 20:43:46 +0800 Subject: [PATCH] =?UTF-8?q?[290=20bus/taxi]bus=E5=8F=B8=E6=9C=BA=E7=AB=AF?= =?UTF-8?q?=E5=9F=8B=E7=82=B9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/och/bus/model/BusOrderModel.java | 5 +++-- .../main/java/com/mogo/och/bus/presenter/BusPresenter.java | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java index d505f30b43..d98bdd536a 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java @@ -539,8 +539,9 @@ public class BusOrderModel { */ private void startAutopilot(boolean isRestart) { - isArrivedStation = false; + triggerStartServiceEvent(isRestart, false); + isArrivedStation = false; BusStationBean currentStation = stationList.get( backgroundCurrentStationIndex); BusStationBean nextStation = stationList.get( backgroundCurrentStationIndex + 1); @@ -988,7 +989,7 @@ public class BusOrderModel { } public void triggerStartServiceEvent(boolean isRestart, boolean send) { - if (stationList == null || backgroundCurrentStationIndex >= stationList.size() || backgroundCurrentStationIndex == 0) { + if (stationList == null || backgroundCurrentStationIndex >= stationList.size()-1) { return; } BusStationBean currentStation = stationList.get( backgroundCurrentStationIndex); diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java index f963a3aec7..fadc4ad8d1 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java @@ -247,7 +247,6 @@ public class BusPresenter extends Presenter @Override public void startOpenAutopilot() { //非美化模式下启动动画 - BusOrderModel.getInstance().triggerStartServiceEvent(isRestartAutopilot, false); runOnUIThread(() -> mView.startAutopilotAnimation()); }