Merge remote-tracking branch 'origin/dev2' into dev2

modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java

@@ -21,7 +21,7 @@ public class CarSeries {
         if ( invokeFlag ) {
             return isF8xxSeries;
         }
-        isF8xxSeries = DebugConfig.getProductFlavor().startsWith( "f8" );
+        isF8xxSeries = DebugConfig.getProductFlavor().startsWith( "f" );
         invokeFlag = true;
         return isF8xxSeries;
     }

modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenterHandler.java

@@ -33,7 +33,7 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter {
     private Map< String, IMogoLocationListener > mLocation = new HashMap<>();
     private Map< String, IMogoMarkerClickListener > mMarker = new HashMap<>();
     private Map< String, IMogoAimlessModeListener > mAimless = new HashMap<>();
-    private Map< String, IMogoCarLocationChangedListener > mCarLocations = new HashMap<>();
+    private Map< String, IMogoCarLocationChangedListener > mCarLocations = new ConcurrentHashMap<>();
     private Map< String, IMogoADASControlStatusChangedListener > mADAS = new HashMap<>();
 
     private MogoRegisterCenterHandler() {
@@ -190,7 +190,7 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter {
     }
 
     @Override
-    public Iterator<IMogoADASControlStatusChangedListener > getAdasControlStatusChangedListeners(){
+    public Iterator< IMogoADASControlStatusChangedListener > getAdasControlStatusChangedListeners() {
         return mADAS.values().iterator();
     }
 }

modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml

@@ -92,5 +92,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-
 </FrameLayout>