From ad31beab185dcee8db42ec943a07daa6c4dc37cb Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Mon, 31 Jul 2023 18:16:45 +0800
Subject: [PATCH] =?UTF-8?q?[6.0.0]=20taxi=E6=9B=B4=E6=96=B0=E9=94=99?=
 =?UTF-8?q?=E8=AF=AFcode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/taxi/callback/ITaxiOrderStatusCallback.java   | 4 ----
 .../java/com/mogo/och/taxi/presenter/NaviPresenter.java    | 4 ++--
 .../java/com/mogo/och/taxi/presenter/TaxiPresenter.java    | 7 -------
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java b/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java
index 2b6edf2761..f522d7fe82 100644
--- a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java
+++ b/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java
@@ -13,10 +13,6 @@ import java.util.List;
  * Model->Presenter回调：订单相关（进行中/待服务单变更，当前进行单状态变更，新到预约单，抢单，抢单结果状态等等）
  */
 public interface ITaxiOrderStatusCallback {
-
-    // 当前位置距离上车点的距离（米）、预估时间（秒）
-    void onCurrentOrderDistToEndChanged(long meters, long timeInSecond);
-
     /**
      * 导航到目的地
      * @param isAmap 是否是高德导航
diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/presenter/NaviPresenter.java b/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/presenter/NaviPresenter.java
index dbb2618746..1bad3b05e8 100644
--- a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/presenter/NaviPresenter.java
+++ b/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/presenter/NaviPresenter.java
@@ -31,7 +31,7 @@ public class NaviPresenter extends Presenter<TaxiRottingNaviFragment> implements
 
     public NaviPresenter(TaxiRottingNaviFragment view) {
         super(view);
-        TaxiModel.getInstance().init(AbsMogoApplication.getApp());
+        TaxiModel.INSTANCE.init(AbsMogoApplication.getApp());
         initListeners();
     }
 
@@ -47,7 +47,7 @@ public class NaviPresenter extends Presenter<TaxiRottingNaviFragment> implements
     }
 
     private void initListeners() {
-        TaxiModel.getInstance().setMoGoAutopilotPlanningListener(this);
+        TaxiModel.INSTANCE.setMoGoAutopilotPlanningListener(this);
     }
 
     private void runOnUIThread( Runnable executor ) {
diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java b/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
index ba7591f39d..0e178cbe45 100644
--- a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
+++ b/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
@@ -169,13 +169,6 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
         runOnUIThread(() -> mView.stopAnimAndUpdateBtnStatus());
     }
 
-    @Override
-    public void onCurrentOrderDistToEndChanged(long meters, long timeInSecond) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            runOnUIThread(() -> mView.onCurrentOrderDistToEndChanged(meters,timeInSecond));
-        }
-    }
-
     @Override
     public void onNaviToEnd(boolean isAmap, boolean isShow) {
         runOnUIThread( () -> mView.onNaviToEnd(isAmap,isShow));