From c6ce25c983eb253194607a111878ad3e86b7717a Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Wed, 6 Jan 2021 14:55:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3m3=E4=B8=8A=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/module/main/EventDispatchCenter.java | 10 +++++-----
 .../mogo/module/service/marker/MapMarkerManager.java   |  3 +++
 .../com/mogo/service/impl/adas/MogoADASController.java |  3 +++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java
index f9c9b3e85f..9f2b9ccc07 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java
@@ -159,14 +159,14 @@ public class EventDispatchCenter implements
         this.mMapLoadedCallback = callback;
     }
 
-    private boolean mIsMapLoaded = false;
+//    private boolean mIsMapLoaded = false;
 
     @Override
     public void onMapLoaded() {
-        if ( mIsMapLoaded ) {
-            return;
-        }
-        mIsMapLoaded = true;
+//        if ( mIsMapLoaded ) {
+//            return;
+//        }
+//        mIsMapLoaded = true;
         if ( mMapLoadedCallback != null ) {
             mMapLoadedCallback.run();
             mMapLoadedCallback = null;
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 02a5d7576d..7b2d457dab 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
@@ -161,6 +161,9 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
                             if ( data == null ) {
                                 return;
                             }
+                            if ( !MogoApisHandler.getInstance().getApis().getStatusManagerApi().isMainPageLaunched() ) {
+                                return;
+                            }
 //                            if ( !MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode() ) {
 ////                            return;
 //                            }
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
index f828ef9ab8..6c54f4d423 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
@@ -179,6 +179,9 @@ public class MogoADASController implements IMogoADASController {
     }
 
     private void invokeCallbackPerSecond( List< RectInfo > data ) {
+        if ( !MogoApisHandler.getInstance().getApis().getStatusManagerApi().isMainPageLaunched() ) {
+            return;
+        }
         List< RectInfo > newRef = data;
         List< ADASRecognizedListResult > recognizedListResults = AdasObjectUtils.regroupData( newRef );
         if ( recognizedListResults == null || recognizedListResults.isEmpty() ) {