diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java index d2e2aaf6e6..0a05343782 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java @@ -878,10 +878,16 @@ public class AMapNaviViewWrapper implements IMogoMapView, } private MyLocationStyle getMyLocationStyle() { + MyLocationStyle style = null; try { - return mMapView.getMap().getMyLocationStyle(); + style = mMapView.getMap().getMyLocationStyle(); } catch ( Exception e ) { - return new MyLocationStyle(); + style = new MyLocationStyle(); + } finally { + if ( style == null ) { + style = new MyLocationStyle(); + } + return style; } } diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java index f189b0646e..2c70ee3345 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java @@ -465,10 +465,16 @@ public class AMapViewWrapper implements IMogoMapView, } private MyLocationStyle getMyLocationStyle() { + MyLocationStyle style = null; try { - return mMapView.getMap().getMyLocationStyle(); + style = mMapView.getMap().getMyLocationStyle(); } catch ( Exception e ) { - return new MyLocationStyle(); + style = new MyLocationStyle(); + } finally { + if ( style == null ) { + style = new MyLocationStyle(); + } + return style; } } diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java index d4f71eb6a0..679e008277 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java @@ -82,8 +82,8 @@ public class AMapMarkerWrapper implements IMogoMarker, Observer { mMogoMarkerOptions = null; } if ( mMarker != null ) { - mMarker.remove(); mMarker.setObject( null ); + mMarker.remove(); mMarker = null; } if ( mMovingPointOverlay != null ) {