From 95781acafd47aabd7cd30587e8af7fc4772458a8 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Fri, 21 Feb 2020 11:32:05 +0800
Subject: [PATCH] opt

---
 .../java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java    | 2 ++
 .../com/mogo/module/service/marker/MapMarkerManager.java    | 6 +++---
 .../mogo/service/impl/statusmanager/MogoStatusManager.java  | 4 ++++
 3 files changed, 9 insertions(+), 3 deletions(-)

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 555be3ac0f..a88ee4e14b 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
@@ -352,6 +352,7 @@ public class AMapNaviViewWrapper implements IMogoMapView,
 
     @Override
     public void changeZoom(float zoom) {
+        Logger.d( TAG, "changeZoom %s", zoom );
         getMap().changeZoom(zoom);
     }
 
@@ -403,6 +404,7 @@ public class AMapNaviViewWrapper implements IMogoMapView,
 
     @Override
     public void moveToCenter(MogoLatLng latLng) {
+        Logger.d( TAG, "move to center %s", latLng );
         if (latLng == null || latLng.lat == 0.0d || latLng.lng == 0.0d) {
             Logger.e(TAG, "latlng = null or is illegal");
             return;
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 e049d34bb1..697c4438ad 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
@@ -119,7 +119,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag
         Logger.i(TAG, "onMarkerClicked 点击了大而全中的Marker：" + marker);
         try {
             // 移动地图到指定位置
-            MarkerServiceHandler.getMogoStatusManager().setUserInteractionStatus(ServiceConst.TYPE, true, true);
+            MarkerServiceHandler.getMogoStatusManager().setUserInteractionStatus(ServiceConst.TYPE, true, false);
             MarkerServiceHandler.getMapUIController().moveToCenter(marker.getPosition());
 
             if (lastMarker != null) {
@@ -510,8 +510,8 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag
                 if (isFirstMarker && isOnLineCard) {
                     if (nearlyMogoMarker != null) {
                         Logger.w(TAG, "ACC ON,或者语音搜索触发，默认选中最近的在线车辆nearlyMogoMarker：" + nearlyMogoMarker);
-                        onMarkerClicked(nearlyMogoMarker);
-                        MogoMarkersHandler.getInstance().onMarkerClicked(nearlyMogoMarker);
+//                        onMarkerClicked(nearlyMogoMarker);
+//                        MogoMarkersHandler.getInstance().onMarkerClicked(nearlyMogoMarker);
                         isFirstMarker = false;
                     }
                 }
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java
index c64afed7cb..75942c569f 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java
@@ -8,6 +8,7 @@ import com.mogo.service.MogoServicePaths;
 import com.mogo.service.statusmanager.IMogoStatusChangedListener;
 import com.mogo.service.statusmanager.IMogoStatusManager;
 import com.mogo.service.statusmanager.StatusDescriptor;
+import com.mogo.utils.logger.Logger;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -24,6 +25,8 @@ import java.util.concurrent.ConcurrentHashMap;
 @Route( path = MogoServicePaths.PATH_STATUS_MANAGER )
 public class MogoStatusManager implements IMogoStatusManager {
 
+    private static final String TAG = "MogoStatusManager";
+
     /**
      * 状态记录
      */
@@ -123,6 +126,7 @@ public class MogoStatusManager implements IMogoStatusManager {
 
     @Override
     public void setUserInteractionStatus( String tag, boolean interrupt, boolean callback ) {
+        Logger.d( TAG, "setUserInteractionStatus handler = %s, status = %s, callback = %s", tag, interrupt, callback );
         mStatus.put( StatusDescriptor.USER_INTERACTED, interrupt );
         if ( callback ) {
             invokeStatusChangedListener( StatusDescriptor.USER_INTERACTED, interrupt );