Merge remote-tracking branch 'origin/dev' into dev

2020-10-21 10:53:30 +08:00
parent 3b589efc03 3c5a59cab1
commit 88fc1d0d34
5 changed files with 390 additions and 600 deletions
--- 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
@@ -1022,6 +1022,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
    public void onCloseCurrentSelectedMarker(){
        if ( mLastCheckMarker != null && !mLastCheckMarker.isDestroyed()) {
            closeMarker( mLastCheckMarker );
+            mLastCheckMarker = null;
        }
    }
 }
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/TextureVideoView.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/TextureVideoView.java