From 1cf9c758dd9a0b98f0cfb84ae2572edb5821c515 Mon Sep 17 00:00:00 2001
From: zhangyuanzhen <zhangyuanzhen@zhidaoauto.com>
Date: Thu, 20 Feb 2020 15:07:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E5=AF=BC=E8=88=AA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java   | 1 -
 .../src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java   | 2 ++
 .../java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
index 11e59c1985..993fd3418d 100644
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
@@ -467,7 +467,6 @@ public class AMapNaviViewWrapper implements IMogoMapView,
         if (checkAMapView()) {
             mMapView.setCarOverlayVisible(true);
             showMyLocation( false );
-            NaviClient.getInstance(getContext()).stopAimlessMode();
         }
     }
 
diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java
index c752f47731..75975a1be4 100644
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java
@@ -142,7 +142,9 @@ public class NaviClient implements IMogoNavi {
         }
         // 关闭巡航
         //mAMapNavi.stopAimlessMode();
+        stopAimlessMode();
         mIsRealNavi = isRealNavi;
+
         boolean result = mAMapNavi.startNavi( isRealNavi ? NaviType.GPS : NaviType.EMULATOR );
         Logger.d( TAG, "start navi status: %s", result );
     }
diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt
index 86cc2cacee..2149aa2620 100644
--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt
@@ -199,7 +199,6 @@ class NaviSettingFragment : BaseFragment(), OnCheckedChangeListener {
               if (checkedId == R.id.rb_navi_detail) BroadcastMode.DETAIL else BroadcastMode.CONCISE
           )
 
-
       if (checkedId == R.id.rb_navi_detail) {
         SearchServiceHolder.analyticsManager.track("Navigation_guide_type", mapOf("type" to 1))
       } else {