From 07d970175f4c8ca1ca4617b39228d276c96611ef Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Mon, 25 Jul 2022 14:00:51 +0800
Subject: [PATCH] =?UTF-8?q?[290=20taxi=E5=8F=B8=E6=9C=BA=E7=AB=AF]=20?=
 =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E4=BB=A3=E9=A9=BEUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt  | 2 --
 .../src/main/java/com/mogo/och/taxi/model/TaxiModel.java   | 2 +-
 .../java/com/mogo/och/taxi/presenter/TaxiPresenter.java    | 4 ++--
 .../java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java     | 7 +++++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt
index ea93a1e16f..cd34ecc455 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/constant/TaxiConst.kt
@@ -80,7 +80,5 @@ class TaxiConst {
         const val TYPE_MARKER_TAXI_ORDER = "TYPE_MARKER_TAXI_ORDER"
 
         const val TIMER_START_AUTOPILOT_INTERVAL = 20 * 1000L
-
-        const val MAN_MACHINE_CO_DRIVING = 3
     }
 }
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
index 97489c0400..b7a0700bdd 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
@@ -1130,7 +1130,7 @@ public class TaxiModel {
                     return;
                 }
 
-            }else if (state == TaxiConst.MAN_MACHINE_CO_DRIVING){
+            }else if (state == IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING){
                 if (state != mPrevAPStatus && mADASStatusCallback != null){
                     mADASStatusCallback.onManMachineCoDriving();
                 }
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
index d5949ff500..b216286cc1 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
@@ -180,11 +180,11 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
     public void onAutopilotRunning() {
         runOnUIThread(() -> mView.updateAutopilotStatus(
                 IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING));
-    }
+
 
     @Override
     public void onManMachineCoDriving() {
-        runOnUIThread(() -> mView.onManMachineCoDriving(TaxiConst.MAN_MACHINE_CO_DRIVING));
+        runOnUIThread(() -> mView.onManMachineCoDriving(IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING));
     }
 
     @Override
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 1ccf27612e..dabcedf8d2 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
@@ -235,6 +235,9 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
             public void onClickImpl(View 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()){
@@ -278,7 +281,7 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
         );
 
         findViewById(R.id.btnAutopilotmanco).setOnClickListener(view ->
-                onAutopilotStatusChanged(TaxiConst.MAN_MACHINE_CO_DRIVING));
+                onAutopilotStatusChanged(IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING));
 
         tvOperationStatus.setOnClickListener(view -> {
             onChangeOperationStatus();
@@ -413,7 +416,7 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
 
             ctvAutopilotStatusRL.setBackground(getResources().getDrawable(R.drawable.taxi_autopilot_bg_selector));
             animatorDrawableUtil = null;
-        } else if (TaxiConst.MAN_MACHINE_CO_DRIVING == status){
+        } else if (IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING == status){
             mAutopilotTv.setText("远程代驾");
             mAutopilotTv.setTextColor(getResources().getColor(R.color.taxi_autopilot_text_color_normal));
             mAutopilotImage.setImageResource(R.drawable.taxi_ic_autopilot);