Merge branch 'dev' into dev_custom_map

# Conflicts:
#	gradle.properties

modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java

@@ -764,6 +764,14 @@ public class MogoServices implements IMogoMapListener,
         restartAutoRefreshAtTime( time, true );
     }
 
+    public void clearAllData(){
+        try {
+            MarkerServiceHandler.getMapService().getMarkerManager( mContext ).removeMarkers();
+        } catch ( Exception e ) {
+            e.printStackTrace();
+        }
+    }
+
     private void restartAutoRefreshAtTime( long time, boolean stopOnlineCarRefresh ) {
         if ( time < 0 ) {
             Logger.w( TAG, "ignore refresh request case time < 0" );

modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/MogoRefreshStrategyController.java

@@ -21,6 +21,11 @@ public class MogoRefreshStrategyController implements IMogoRefreshStrategyContro
         MogoServices.getInstance().restartAutoRefreshAtTime( delay );
     }
 
+    @Override
+    public void clearAllData() {
+        MogoServices.getInstance().clearAllData();
+    }
+
     @Override
     public void init( Context context ) {