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 63f6cb1f18..abd47e4663 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 @@ -76,7 +76,7 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca private CarCursorOption mCarCursorOption = DEFAULT_OPTION; public AMapViewWrapper(MapAutoView mMapView) { - Log.i(TAG, "autoop--AMapViewWrapper: init"); + Logger.i(TAG, "autoop--AMapViewWrapper: init"); this.mMapView = mMapView; this.mIMap = new AMapWrapper(this.mMapView.getMapAutoViewHelper(), this.mMapView, this); } @@ -412,7 +412,7 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca // if ( DebugConfig.isDebug() ) { // Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); // } - Log.d(TAG, "锁车"); + Logger.d(TAG, "锁车"); // mMapView.getMapAutoViewHelper().setZoom(mLockZoom); mMapView.getMapAutoViewHelper().setLockMode(true); mIsCarLocked = true; @@ -424,7 +424,7 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca if (DebugConfig.isDebug()) { Logger.d(TAG, Log.getStackTraceString(new Throwable())); } - Log.d(TAG, "解锁锁车"); + Logger.d(TAG, "解锁锁车"); mMapView.getMapAutoViewHelper().setLockMode(false); mIsCarLocked = false; } @@ -672,7 +672,7 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca @Override public void onMapLoaded() { - Log.i(TAG, "autoop--onMapLoaded: " + isLoaded); + Logger.i(TAG, "autoop--onMapLoaded: " + isLoaded); if (!isLoaded) { isLoaded = true; MogoMapListenerHandler.getInstance().onMapLoaded(); @@ -707,17 +707,17 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca @Override public void onMapStatusChanged(int type, int value) { - Log.i(TAG, "onMapStatusChanged: "+type+","+value); + Logger.i(TAG, "mapop--onMapStatusChanged: "+type+","+value); } @Override - public void onCameraChange(int i, int i1) { - + public void onCameraChange(int type, int value) { + Logger.i(TAG, "mapop--onCameraChange: "+type+","+value); } @Override public void onCameraChangeFinish(@Nullable CameraPosition cameraPosition) { - Log.i(TAG, "onCameraChangeFinish: "+cameraPosition); + Logger.i(TAG, "mapop--onCameraChangeFinish: "+cameraPosition); if ( cameraPosition != null ) { Trace.beginSection( "timer.onCameraChangeFinish" ); MogoMapListenerHandler.getInstance().onMapChanged(ObjectUtils.fromAMap( cameraPosition.getTarget() ), diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java index 87b5e3d681..d304a189af 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java @@ -271,7 +271,9 @@ public class AMapMarkerWrapper implements IMogoMarker, Observer { mMarker.setOnMarkClickListener(new Marker.OnMarkClickListener() { @Override public void onMarkClick(@NotNull Marker marker) { - mMogoMarkerClickListener.onMarkerClicked(AMapMarkerWrapper.this); + if(mMogoMarkerClickListener!= null){ + mMogoMarkerClickListener.onMarkerClicked(AMapMarkerWrapper.this); + } } }); }