dev

libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java

@@ -619,6 +619,7 @@ public class AMapNaviViewWrapper implements IMogoMapView,
     public void displayOverview() {
         if ( checkAMapView() ) {
             if ( NaviClient.getInstance( getContext() ).isNaviing() ) {
+                loseLockMode();
                 NaviClient.getInstance( getContext() ).displayOverview();
             }
         }

libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java

@@ -10,11 +10,13 @@ import com.amap.api.navi.enums.AimLessMode;
 import com.amap.api.navi.enums.NaviType;
 import com.amap.api.navi.model.NaviLatLng;
 import com.mogo.map.MogoLatLng;
+import com.mogo.map.impl.amap.message.AMapMessageManager;
 import com.mogo.map.impl.amap.utils.ObjectUtils;
 import com.mogo.map.navi.IMogoCarLocationChangedListener;
 import com.mogo.map.navi.IMogoNavi;
 import com.mogo.map.navi.MogoCalculatePath;
 import com.mogo.map.navi.MogoNaviConfig;
+import com.mogo.map.navi.MogoNaviListenerHandler;
 import com.mogo.map.navi.OnCalculatePathItemClickInteraction;
 import com.mogo.utils.logger.Logger;
 
@@ -151,7 +153,13 @@ public class NaviClient implements IMogoNavi {
         stopAimlessMode();
         mIsRealNavi = isRealNavi;
 
+        boolean isNaving = isNaviing();
         boolean result = mAMapNavi.startNavi( isRealNavi ? NaviType.GPS : NaviType.EMULATOR );
+        if ( isNaving && !result ) {
+            // 如果正在导航，又重新规划路线，startNavi 不会成功，不会重新回调 #onStartNavi
+            MogoNaviListenerHandler.getInstance().onStartNavi();
+            AMapMessageManager.getInstance().postNaviStarted();
+        }
         Logger.d( TAG, "start navi status: %s", result );
     }
 

libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviOverlayHelper.java

@@ -452,6 +452,6 @@ public class NaviOverlayHelper implements OnCalculatePathItemClickInteraction {
      * 展示全程
      */
     public void displayOverview(){
-        showCalculatedPaths( null );
+        showBounds();
     }
 }