From b4d64c5b27af9bbddeb863e5c76367fec87c8f32 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Thu, 10 Nov 2022 14:55:29 +0800
Subject: [PATCH] =?UTF-8?q?[2.12.0]=20fix=20taxi=E5=8F=B8=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AF=E7=82=B9=E5=87=BB=E9=80=81=E9=A9=BE=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E5=B4=A9=E6=BA=83=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../callback/ITaxiOrderStatusCallback.java    |  4 +--
 .../com/mogo/och/taxi/model/TaxiModel.java    | 26 ++++++++++++-------
 .../och/taxi/presenter/TaxiPresenter.java     |  8 +++---
 .../mogo/och/taxi/ui/BaseTaxiTabFragment.java |  2 +-
 .../ui/TaxiBeingServerdOrdersFragment.java    |  6 ++---
 .../com/mogo/och/taxi/ui/TaxiFragment.java    |  8 +++---
 .../och/taxi/ui/TaxiServerOrdersFragment.java |  4 +--
 7 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java
index af980f8aea..eb825964ed 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java
@@ -52,7 +52,7 @@ public interface ITaxiOrderStatusCallback {
     /**
      * 导航到目的地
      * @param isAmap 是否是高德导航
-     * @param isVoicePlay 是否播报声音
+     * @param isShow 是否显示导航地图（否播报声音）
      */
-    void onNaviToEnd(boolean isAmap, boolean isVoicePlay);
+    void onNaviToEnd(boolean isAmap, boolean isShow);
 }
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 764bff6369..9c70c9d107 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
@@ -1597,20 +1597,26 @@ public class TaxiModel {
     }
 
     //导航去订单终点目的地
-    public void startNaviToEndStation(boolean isVoicePlay){
+    public void startNaviToEndStation(boolean isShow){
         if (mRoutePoints.size() > 0 ){ //使用自驾轨迹
             if (mOrderStatusCallback != null){
-                mOrderStatusCallback.onNaviToEnd(false,isVoicePlay);
+                mOrderStatusCallback.onNaviToEnd(false,isShow);
             }
-        }else {//2s后若无轨迹数据使用高德导航
-            UiThreadHandler.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    if (mRoutePoints.size() == 0 && mOrderStatusCallback != null){
-                        mOrderStatusCallback.onNaviToEnd(true,isVoicePlay);
+        }else {//若直接要显示导航地图则直接导航， 若不是则2s后若无轨迹数据使用高德导航
+            if (isShow && mRoutePoints.size() == 0 && mOrderStatusCallback != null){
+
+                mOrderStatusCallback.onNaviToEnd(true,true);
+            }else {
+                UiThreadHandler.postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (mRoutePoints.size() == 0 && mOrderStatusCallback != null){
+                            mOrderStatusCallback.onNaviToEnd(true,false);
+                        }
                     }
-                }
-            },2000l);
+                },2000l);
+            }
+
         }
     }
 }
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 94dcdc28d2..ee9f9322e9 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
@@ -184,8 +184,8 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
     }
 
     //导航去订单目的地
-    public void startNaviToEndStation(boolean isVoicePlay){
-       TaxiModel.getInstance().startNaviToEndStation(isVoicePlay);
+    public void startNaviToEndStation(boolean isShow){
+       TaxiModel.getInstance().startNaviToEndStation(isShow);
     }
 
     public void reportToEndDisAndTime(long lastSumLength, long duration){//米/秒
@@ -323,8 +323,8 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
     }
 
     @Override
-    public void onNaviToEnd(boolean isAmap, boolean isVoicePlay) {
-        runOnUIThread( () -> mView.onNaviToEnd(isAmap,isVoicePlay));
+    public void onNaviToEnd(boolean isAmap, boolean isShow) {
+        runOnUIThread( () -> mView.onNaviToEnd(isAmap,isShow));
     }
 
     @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 8dc6ad1bab..bdd87e7431 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
@@ -624,5 +624,5 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
 
 
 
-    public abstract void startNaviToEndStation(boolean isVoicePlay);
+    public abstract void startNaviToEndStation(boolean isShow);
 }
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
index e3ec7b298c..db6e275a06 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
@@ -618,7 +618,6 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment
      * @param isShow
      */
     private void showNaviToEndStationFragment(boolean isShow) {
-        mTaxiFragment.showAmapNaviToStationFragment(isShow);
         mTaxiFragment.startNaviToEndStation(isShow);
     }
 
@@ -698,12 +697,13 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment
         }, 3000);
     }
 
-    public void onNaviToEndAmap(boolean isVoicePlay) {
+    public void onNaviToEndAmap(boolean isShow) {
         if (mCurrentOrder != null &&
                 mCurrentOrder.orderStatus == TaxiOrderStatusEnum.OnTheWayToEnd.getCode()){
             double orderEndStationLat = mCurrentOrder.endSiteGcjPoint.get(1);
             double orderEndStationLng = mCurrentOrder.endSiteGcjPoint.get(0);
-            startNaviToStation(isVoicePlay,orderEndStationLat,orderEndStationLng);
+            mTaxiFragment.showAmapNaviToStationFragment(isShow);
+            startNaviToStation(isShow,orderEndStationLat,orderEndStationLng);
         }
     }
 
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
index 219d5090b8..d94c06c813 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
@@ -95,8 +95,8 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
     }
 
     @Override
-    public void startNaviToEndStation(boolean isVoicePlay) {
-        mPresenter.startNaviToEndStation(isVoicePlay);
+    public void startNaviToEndStation(boolean isShow) {
+        mPresenter.startNaviToEndStation(isShow);
     }
 
     @Override
@@ -311,10 +311,10 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
         grabOrderFragment.onGrabOrderFailed();
     }
 
-    public void onNaviToEnd(boolean isAmap , boolean isVoicePlay){
+    public void onNaviToEnd(boolean isAmap , boolean isShow){
         if (isAmap){
             if (null == serverOrdersFragment) return;
-            serverOrdersFragment.onNaviToEndAmap(isVoicePlay);
+            serverOrdersFragment.onNaviToEndAmap(isShow);
         }else { //使用rotting数据
             showRottingToStationFragment(true);
         }
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java
index eb8874dc3c..cc7cd2289b 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java
@@ -215,8 +215,8 @@ public class TaxiServerOrdersFragment extends BaseTaxiUIFragment {
         beingServerdOrdersFragment.updateOrderBottomBtnUI();
     }
 
-    public void onNaviToEndAmap(boolean isVoicePlay){
+    public void onNaviToEndAmap(boolean isShow){
         if (null == beingServerdOrdersFragment) return;
-        beingServerdOrdersFragment.onNaviToEndAmap(isVoicePlay);
+        beingServerdOrdersFragment.onNaviToEndAmap(isShow);
     }
 }