From 0ada00a5c518f10a3ee16b3746cdd1b542d7867d Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Mon, 17 Oct 2022 17:46:46 +0800
Subject: [PATCH] =?UTF-8?q?[2.11.0]=20bus=E5=8F=B8=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E8=87=AA=E9=A9=BE=E7=8A=B6=E6=80=81=E8=B5=8B=E5=80=BC=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/bus/presenter/BusPresenter.java  | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 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 88aa1860c1..8106fb33e6 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
@@ -173,20 +173,20 @@ public class BusPresenter extends Presenter<BusFragment>
         switch (state) {
             case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE:
                 if (currentAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) {
-
-                    currentAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE;
                     // 设置UI【自动驾驶】按钮是否展示
                     runOnUIThread(() -> mView.onAutopilotEnableChange(true));
-
-                    if (FunctionBuildConfig.isDemoMode
-                            && (
-                            (mCurrentStation >= 0 && mCurrentStation <= mStationList.size() - 1)
-                                    && BusOrderModel.getInstance().isGoingToNextStation()
-                    )
-                    ) {
-                        CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel=", "有美化功能");
-                        return;
-                    }
+                }
+                if (FunctionBuildConfig.isDemoMode
+                        && (
+                        (mCurrentStation >= 0 && mCurrentStation <= mStationList.size() - 1)
+                                && BusOrderModel.getInstance().isGoingToNextStation()
+                )
+                ) {
+                    CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel=", "有美化功能");
+                    return;
+                }
+                if (currentAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) {
+                    currentAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE;
                 }
                 // 改变UI自动驾驶状态
                 runOnUIThread(() -> mView.onAutopilotStatusChanged(currentAutopilotStatus));
@@ -201,19 +201,19 @@ public class BusPresenter extends Presenter<BusFragment>
                 runOnUIThread(() -> mView.onAutopilotStatusChanged(currentAutopilotStatus));
                 break;
             case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE:
+                if (FunctionBuildConfig.isDemoMode
+                        && (
+                        (mCurrentStation >= 0 && mCurrentStation <= mStationList.size() - 1)
+                                && BusOrderModel.getInstance().isGoingToNextStation()
+
+                )
+                ) {
+                    CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel=", "有美化功能");
+                    return;
+                }
+
                 if (currentAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE) {
-
                     currentAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE;
-                    if (FunctionBuildConfig.isDemoMode
-                            && (
-                            (mCurrentStation >= 0 && mCurrentStation <= mStationList.size() - 1)
-                                    && BusOrderModel.getInstance().isGoingToNextStation()
-
-                    )
-                    ) {
-                        CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel=", "有美化功能");
-                        return;
-                    }
                 }
                 runOnUIThread(() -> {
                     mView.onAutopilotStatusChanged(currentAutopilotStatus);