From 8b7cfe40512d188040c1855b80fd79092b08fc50 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Fri, 7 Aug 2020 16:23:03 +0800 Subject: [PATCH] bugfix: npe interrupt 'work-thread-handler' thread --- .../com/mogo/module/service/marker/MapMarkerManager.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index b82cca0027..12d74cddc5 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -403,6 +403,9 @@ public class MapMarkerManager implements IMogoMarkerClickListener, return; } IMogoMarker marker = drawMapMarker( entity, ServiceConst.MARKER_Z_INDEX_HIGH ); + if ( marker == null ) { + return; + } marker.startScaleAnimationWithAlpha( 0, 1.2f, 0, 1.2f, 0f, 1f, 300, new LinearInterpolator(), new OnMarkerAnimationListener() { @Override public void onAnimStart() { @@ -411,7 +414,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, @Override public void onAnimEnd() { - if ( marker.isDestroyed() ) { + if ( marker == null || marker.isDestroyed() ) { return; } marker.startScaleAnimation( 1.2f, 1, 1.2f, 1, 100, new LinearInterpolator(), null );