From 8998e13110e2061988edfb11c427204c30fd427a Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 14 Jul 2022 15:50:50 +0800 Subject: [PATCH] =?UTF-8?q?[282=20bus]=20bus=E5=8F=B8=E6=9C=BA=E7=AB=AF?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E8=87=AA=E5=8A=A8=E9=A9=BE=E9=A9=B6=E5=9F=8B?= =?UTF-8?q?=E7=82=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/bus/presenter/BusPresenter.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) 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 0c84b1a1a8..c5e16e1060 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 @@ -48,6 +48,7 @@ public class BusPresenter extends Presenter private int currentAutopilotStatus = -1; private List mStationList = new ArrayList<>(); private int mCurrentStation = 0; + private boolean isRestartAutopilot = false; public BusPresenter(BusFragment view) { super(view); @@ -85,14 +86,6 @@ public class BusPresenter extends Presenter BusOrderModel.getInstance().setControllerStatusCallback(null); } -// public void setIsAnimateRunning(boolean isAnimateRunning){ -// this.isAnimateRunning = isAnimateRunning; -// } - -// public boolean getIsAnimateRunning(){ -// return isAnimateRunning; -// } - public void queryBusRoutes() { BusOrderModel.getInstance().queryBusRoutes(); } @@ -104,12 +97,14 @@ public class BusPresenter extends Presenter public void autoDriveToNextStation(boolean isRestart) { currentAutopilotStatus = -1; BusOrderModel.getInstance().autoDriveToNextStation(isRestart); + isRestartAutopilot = false; } public void restartAutopilot() { if (BusOrderModel.getInstance().isGoingToNextStation()){ currentAutopilotStatus = -1; BusOrderModel.getInstance().restartAutopilot(); + isRestartAutopilot = true; } } @@ -204,7 +199,7 @@ public class BusPresenter extends Presenter // 改变UI自动驾驶状态 runOnUIThread(() -> mView.onAutopilotStatusChanged(currentAutopilotStatus)); BusOrderModel.getInstance().triggerStartServiceEvent( - BusOrderModel.getInstance().isGoingToNextStation(), true); + isRestartAutopilot, true); } break; case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE: