Merge branch 'dev_1.1' into dev_1.1.2

modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XPoiTypeEnum.java

@@ -18,14 +18,14 @@ public interface V2XPoiTypeEnum extends MarkerPoiTypeEnum {
     String ALERT_TRAFFIC_LIGHT_WARNING = "99996";
     // 故障车辆
     int ALERT_CAR_TROUBLE_WARNING = 20007;
+    // 疲劳驾驶
+    String ALERT_FATIGUE_DRIVING = "99993";
+    // 违章停车
+    String ALERT_ILLEGAL_PARK = "99992";
 
     // TODO 这里目前是演示DEMO会用到，想着是打算商用，先这么处理的
     // 取快递
     String ALERT_TRAFFIC_EXPRESS = "99995";
     // 顺风车
     String ALERT_TRAFFIC_TAXI = "99994";
-    // 疲劳驾驶
-    String ALERT_FATIGUE_DRIVING = "99993";
-    // 违章停车
-    String ALERT_ILLEGAL_PARK = "99992";
 }

modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java

@@ -310,6 +310,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
         mMogoMapUIController = null;
         mMogoFragmentManager = null;
         mServiceApis.getAdasControllerApi().release();
+        mServiceApis.getRefreshStrategyControllerApi().clearAllData();
         AIAssist.getInstance( this ).release();
     }
 }

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 ) {