diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoOverlayManager.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoOverlayManager.java index 6cde910cf3..271cf4f453 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoOverlayManager.java +++ b/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; } } diff --git a/modules/mogo-module-smp/src/main/assets/small_map_style.data b/modules/mogo-module-smp/src/main/assets/small_map_style.data index 412a2ab911..f8b175ad2c 100644 Binary files a/modules/mogo-module-smp/src/main/assets/small_map_style.data and b/modules/mogo-module-smp/src/main/assets/small_map_style.data differ diff --git a/modules/mogo-module-smp/src/main/assets/small_map_style_extra.data b/modules/mogo-module-smp/src/main/assets/small_map_style_extra.data index e5890460f3..2de0626f28 100644 Binary files a/modules/mogo-module-smp/src/main/assets/small_map_style_extra.data and b/modules/mogo-module-smp/src/main/assets/small_map_style_extra.data differ diff --git a/modules/mogo-module-smp/src/main/assets/style.data b/modules/mogo-module-smp/src/main/assets/style.data deleted file mode 100644 index 412a2ab911..0000000000 Binary files a/modules/mogo-module-smp/src/main/assets/style.data and /dev/null differ diff --git a/modules/mogo-module-smp/src/main/assets/style_extra.data b/modules/mogo-module-smp/src/main/assets/style_extra.data deleted file mode 100644 index e5890460f3..0000000000 Binary files a/modules/mogo-module-smp/src/main/assets/style_extra.data and /dev/null differ diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java index 3c716980f1..9e131500ea 100644 --- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java +++ b/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); } } ); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java index 425e390239..75e56980d3 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java +++ b/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(); diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking_vr.xml index 008a6e19d4..9df10c82c1 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking_vr.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking_vr.xml @@ -22,9 +22,9 @@