diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java
index 33d0adeeca..bf2aec9bca 100644
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java
@@ -98,18 +98,12 @@ public class NaviListenerAdapter extends AMapNaviListenerAdapter {
 
     @Override
     public void onEndEmulatorNavi() {
-        setNaviing( false );
-        setStopped( true );
-        MogoNaviListenerHandler.getInstance().onStopNavi();
-        AMapMessageManager.getInstance().postNaviStopped();
+        stopNavi();
     }
 
     @Override
     public void onArriveDestination() {
-        setNaviing( false );
-        setStopped( true );
-        MogoNaviListenerHandler.getInstance().onStopNavi();
-        AMapMessageManager.getInstance().postNaviStopped();
+        stopNavi();
     }
 
     @Override