Merge branch 'dev_merge_shunyi_vr_map' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev_merge_shunyi_vr_map

libraries/mogo-map/src/main/java/com/mogo/map/MogoOverlayManager.java

@@ -1,5 +1,7 @@
 package com.mogo.map;
 
+import android.util.Log;
+
 import com.mogo.map.overlay.IMogoOverlayManager;
 import com.mogo.map.overlay.IMogoPolyline;
 import com.mogo.map.overlay.MogoPolylineOptions;
@@ -30,11 +32,12 @@ public class MogoOverlayManager implements IMogoOverlayManager {
     }
 
     @Override
-    public IMogoPolyline addPolyline( MogoPolylineOptions options ) {
+    public IMogoPolyline addPolyline(MogoPolylineOptions options) {
         try {
-            return MogoMap.getInstance().getMogoMap().addPolyline( options );
-        } catch ( Exception e ) {
-            return null;
+            return MogoMap.getInstance().getMogoMap().addPolyline(options);
+        } catch (Exception e) {
+            e.printStackTrace();
         }
+        return null;
     }
 }

modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java

@@ -214,6 +214,10 @@ public class SmallMapDirectionView extends RoundLayout {
                                     options.setCustomMapStylePath(styleFilePath);
                                     mAMapNaviView.setViewOptions(options);
                                 }
+
+                                //设置希望展示的地图缩放级别
+                                CameraUpdate cameraUpdate = CameraUpdateFactory.zoomTo(12);
+                                aMap.moveCamera(cameraUpdate);
                             }
                         }
                 );

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java

@@ -569,10 +569,8 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
                     mAlarmInfoMarker.setInfoWindowAdapter(new RoadConditionInfoWindow3DAdapter(markerShowEntity, AbsMogoApplication.getApp(), mAlarmInfoMarker.getMogoMarkerOptions()));
                     mAlarmInfoMarker.showInfoWindow();
                 } else {
-                    IMarkerView iMarkerView = MapMarkerAdapter.getMarkerView(context, markerShowEntity, optionsRipple);
                     optionsRipple.icon(V2XMarkerAdapter.getV2XRoadEventViewPng(context, roadEventEntity));
                     mAlarmInfoMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_EVENT_ALARM_POI, optionsRipple);
-                    mAlarmInfoMarker.setMarkerIconView((IMogoMarkerIconViewCreator) iMarkerView);
                 }
                 // 当前Marker设置为最上面
                 mAlarmInfoMarker.setToTop();

modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking_vr.xml

@@ -22,9 +22,9 @@
 
     <ImageView
         android:id="@+id/ivIconP"
-        android:layout_width="@dimen/module_v2x_event_icon_size_vr"
-        android:layout_height="@dimen/module_v2x_event_icon_size_vr"
-        android:src="@drawable/icon_illegal_parking"
+        android:layout_width="@dimen/dp_100"
+        android:layout_height="@dimen/dp_100"
+        android:src="@drawable/icon_illegal_parking_vr"
         app:layout_constraintBottom_toBottomOf="@+id/leftImageView"
         app:layout_constraintEnd_toEndOf="@+id/leftImageView"
         app:layout_constraintStart_toStartOf="@+id/leftImageView"