From 771e4a702d8ba1f2c51f8bcb7f6bffe270440091 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Thu, 1 Sep 2022 21:01:56 +0800
Subject: [PATCH] =?UTF-8?q?[2.10.0]=20=E7=82=B9=E5=87=BB=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E6=8C=89=E9=92=AE=E5=8E=BB=E6=8E=89=E4=B8=BA?=
 =?UTF-8?q?0=E6=8B=A6=E6=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/och/bus/fragment/BaseBusTabFragment.java  | 6 +-----
 .../main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java | 3 ---
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
index 2230cdcfa2..f42de596bc 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
@@ -171,11 +171,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
 
             @Override
             public void onClickImpl(View v) {
-                if (CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState() != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE){
-                    restartAutopilot();
-                }else {
-                    ToastUtils.showShort(getResources().getString(R.string.bus_auto_disable_tip));
-                }
+                restartAutopilot();
             }
         });
 
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
index 8639133655..fdf4f0d427 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
@@ -232,9 +232,6 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
                 if (CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState() ==
                         IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING){
                     return; //远程代驾状态下不可开启自动驾驶，只能等远程代驾主动退出
-                }else if (CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState() ==
-                        IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE){
-                    ToastUtils.showShort(getResources().getString(R.string.module_och_taxi_auto_disable_tip));
                 }else if (!(boolean)ctvAutopilotStatusRL.getTag()){
                     ToastUtils.showShort(getResources().getString(R.string.module_och_taxi_auto_disable_tip1));
                 }else {