From 20ab4d9a09495de2340cece8c88f2f133a583541 Mon Sep 17 00:00:00 2001 From: jiaguofeng Date: Mon, 6 Jul 2020 10:58:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E5=8A=A0=E8=BD=BD=E5=AE=9A=E4=BD=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/map/impl/custom/AMapBaseMapView.java | 3 ++- .../src/main/java/com/mogo/map/impl/custom/AMapWrapper.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapBaseMapView.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapBaseMapView.java index 87c62cb562..10f164a12b 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapBaseMapView.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapBaseMapView.java @@ -23,9 +23,10 @@ public class AMapBaseMapView implements IMogoMapViewCreator { @Override public IMogoMapView create( Context context ) { - MapAutoApi.INSTANCE.init( MapParams.Companion.init().setDebugMode( true ) + MapAutoApi.INSTANCE.init( MapParams.Companion.init().setDebugMode( false ) .setCoordinateType( MapParams.COORDINATETYPE_GCJ02 ) .setPerspectiveMode( MapParams.MAP_PERSPECTIVE_2D ) + .setZoom( 16 ) .setStyleMode( MapParams.MAP_STYLE_NIGHT ) ); mapAutoView = new MapAutoView( context ); return new AMapViewWrapper( mapAutoView ); diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java index a8c5ddaf58..fc93bbe96d 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java @@ -128,7 +128,7 @@ public class AMapWrapper implements IMogoMap { } MultiPointOverlayOptions multiPointOverlayOptions = new MultiPointOverlayOptions(); multiPointOverlayOptions.setData(markerOptions); - multiPointOverlayOptions.setIcon(R.drawable.marker_blue); + multiPointOverlayOptions.setMarkerIcon(R.drawable.marker_blue); List data = mAMap.addMarkers(multiPointOverlayOptions).getOptions().getData(); for (int i = 0 ;i< data.size();i++){ markers.add(new Marker(data.get(i))); From 929b86ce374859e2621983fe884a2861657dee03 Mon Sep 17 00:00:00 2001 From: jiaguofeng Date: Mon, 6 Jul 2020 11:46:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E6=97=B6=E8=AE=BE=E7=BD=AE=E4=B8=AD=E5=BF=83=E7=82=B9=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/map/impl/custom/AMapBaseMapView.java | 1 + .../java/com/mogo/map/impl/custom/AMapViewWrapper.java | 1 + .../main/java/com/mogo/map/impl/custom/AMapWrapper.java | 7 ++++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapBaseMapView.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapBaseMapView.java index 10f164a12b..94bdad7bab 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapBaseMapView.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapBaseMapView.java @@ -27,6 +27,7 @@ public class AMapBaseMapView implements IMogoMapViewCreator { .setCoordinateType( MapParams.COORDINATETYPE_GCJ02 ) .setPerspectiveMode( MapParams.MAP_PERSPECTIVE_2D ) .setZoom( 16 ) + .setPointToCenter(0.5f,0.5f) .setStyleMode( MapParams.MAP_STYLE_NIGHT ) ); mapAutoView = new MapAutoView( context ); return new AMapViewWrapper( mapAutoView ); diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java index 8f67ac5aa8..9d2f4e9e70 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java @@ -482,6 +482,7 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca // Logger.d(TAG, Log.getStackTraceString(new Throwable())); // } Logger.d(TAG, "setPointToCenter(%s, %s)", mapCenterX, mapCenterY); + MapAutoApi.INSTANCE.getMapParams().setPointToCenter((float) mapCenterX, (float) mapCenterY); mMapView.getMapAutoViewHelper().setPointToCenter((float) mapCenterX, (float) mapCenterY); } } diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java index fc93bbe96d..113f6479ab 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java @@ -1,6 +1,7 @@ package com.mogo.map.impl.custom; import android.content.Context; +import android.graphics.Point; import android.util.Log; import com.mogo.map.IMogoMap; @@ -18,11 +19,14 @@ import com.mogo.map.overlay.MogoPolylineOptions; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.utils.logger.Logger; import com.zhidaoauto.map.sdk.open.MapAutoApi; +import com.zhidaoauto.map.sdk.open.data.MapDataApi; import com.zhidaoauto.map.sdk.open.marker.Marker; import com.zhidaoauto.map.sdk.open.marker.MarkerOptions; import com.zhidaoauto.map.sdk.open.marker.MultiPointOverlayOptions; import com.zhidaoauto.map.sdk.open.poyline.Polyline; import com.zhidaoauto.map.sdk.open.poyline.PolylineOptions; +import com.zhidaoauto.map.sdk.open.query.LonLatPoint; +import com.zhidaoauto.map.sdk.open.tools.MapTools; import com.zhidaoauto.map.sdk.open.view.MapAutoView; import com.zhidaoauto.map.sdk.open.view.MapAutoViewHelper; @@ -164,7 +168,8 @@ public class AMapWrapper implements IMogoMap { @Override public void setPointToCenter(int x, int y) { if (checkAMap()) { - mAMap.setPointToCenter(x, y); + LonLatPoint lonLatPoint = MapTools.INSTANCE.fromScreenLocation(new Point(x,y)); + mAMap.setCenter(lonLatPoint); } }