From 044d8d5fb625c6eef6db95a85e2b4cad3447468b Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 22 Dec 2020 14:34:30 +0800 Subject: [PATCH 1/4] =?UTF-8?q?poi=E8=BF=9E=E7=BA=BF=E7=BB=98=E5=88=B6-?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E9=97=AE=E9=A2=98:=E8=87=AA=E7=A0=94?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=B4=A9=E6=BA=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/map/MogoOverlayManager.java | 11 +++++++---- .../module/v2x/manager/impl/MoGoV2XMarkerManager.java | 2 -- 2 files changed, 7 insertions(+), 6 deletions(-) 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-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(); From 8f949bd4c3ff6644bf06fd37d13b493611fbf1f4 Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 22 Dec 2020 15:26:49 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=A6=81=E6=AD=A2=E5=81=9C=E8=BD=A6icon-vr?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/item_v2x_illegal_parking_vr.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 @@ Date: Tue, 22 Dec 2020 15:52:50 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E9=AB=98=E5=BE=B7?= =?UTF-8?q?=E5=B0=8F=E5=9C=B0=E5=9B=BE=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/assets/small_map_style.data | Bin 141822 -> 129331 bytes .../main/assets/small_map_style_extra.data | Bin 3118 -> 3326 bytes .../src/main/assets/style.data | Bin 141822 -> 0 bytes .../src/main/assets/style_extra.data | Bin 3118 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 modules/mogo-module-smp/src/main/assets/style.data delete mode 100644 modules/mogo-module-smp/src/main/assets/style_extra.data 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 412a2ab911461b5fab38b7083914ac978c20bd0e..f8b175ad2c1d29116ce4d7ba5e88cbb68d8554de 100644 GIT binary patch literal 129331 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 P>avN@matr=y@ReEq_2jwYaY&{9*4Zd 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 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 412a2ab911461b5fab38b7083914ac978c20bd0e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141822 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 Date: Tue, 22 Dec 2020 15:53:54 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=A6=96=E6=AC=A1=E5=AE=B6=E5=9C=A8?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=9A=84=E6=97=B6=E5=80=99=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=9A=84=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/small/map/SmallMapDirectionView.java | 4 ++++ 1 file changed, 4 insertions(+) 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); } } );