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 6baa8d8c7e..e476e35a4c 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
@@ -57,7 +57,6 @@ import com.mogo.och.taxi.bean.TaxiOrPassengerReadyReqBean;
 import com.mogo.och.taxi.callback.ITaxiADASStatusCallback;
 import com.mogo.och.taxi.callback.ITaxiCarStatusCallback;
 import com.mogo.och.taxi.callback.ITaxiControllerStatusCallback;
-import com.mogo.och.taxi.callback.ITaxiNaviChangedCallback;
 import com.mogo.och.taxi.callback.ITaxiOrderStatusCallback;
 import com.mogo.och.taxi.constant.TaxiConst;
 import com.mogo.och.taxi.constant.TaxiOrderStatusEnum;
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 aa56554b91..ae091905e1 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
@@ -352,6 +352,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
 
     private void showOrHideNavi(boolean isShow) {
         if (!isShow) {
+            mNaviStartIcon.setVisibility(View.GONE);
             mNaviStartIcon.setVisibility(View.GONE);
             NaviToDestinationModel.getInstance(getContext()).destroyAmaNavi();
             mTaxiFragment.showNaviToStationFragment(false);
@@ -380,12 +381,12 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
         String strHtml2 = "<font color=\"#CAD6FF\">里程 </font>" + "<b><font color=\"#FFFFFF\">" + dis + "</font></b>" + "<font color=\"#CAD6FF\"> "+disUnit+"</font>"
                 + "<font color=\"#CAD6FF\">，剩余 </font>" + "<b><font color=\"#FFFFFF\">" + min + "</font></b>" + "<font color=\"#CAD6FF\"> 分钟</font>";
 
-        if (mContentModule3 != null && mContentModule3.getVisibility() == View.VISIBLE) { //前往上车点
+        if (mCurrentOrder != null && mCurrentOrder.orderStatus == TaxiOrderStatusEnum.OnTheWayToStart.getCode()) { //前往上车点
 
             mDistanceAndTime3.setText(Html.fromHtml(strHtml2));
             mNaviStartIcon.setVisibility(View.VISIBLE);
-        } else if (mContentModule2 != null && mContentModule2.getVisibility() == View.VISIBLE) { //前往终点 时间单位是分钟
-            mNaviStartIcon.setVisibility(View.VISIBLE);
+        } else if (mCurrentOrder != null && mCurrentOrder.orderStatus == TaxiOrderStatusEnum.OnTheWayToEnd.getCode()) { //前往终点 时间单位是分钟
+            mNaviToEndIcon.setVisibility(View.VISIBLE);
             if (mTtsLessThan200Tip < 1 && meters <= 250 && meters > 150){
                 speekVoice200mTipsOnce();
             }