From b25c8ae020eca6f28a31ab45e238411a17fc1370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 27 Feb 2020 20:28:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E3=80=90=E5=9C=A8?= =?UTF-8?q?=E7=BA=BF=E8=BD=A6=E8=BE=86=E3=80=91=E5=9C=A8=E7=BA=BF=E8=BD=A6?= =?UTF-8?q?=E8=BE=86=E5=92=8C=E5=85=B6=E4=BB=96=E5=8D=A1=E7=89=87=E7=9A=84?= =?UTF-8?q?icon=E5=9C=A8=E5=9C=B0=E5=9B=BE=E4=B8=8A=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=B4=E8=BF=91=E6=97=B6=EF=BC=8C=E6=B0=B8=E8=BF=9C=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E7=9A=84=E6=98=AF=E5=88=AB=E4=BA=BA=E7=9A=84icon?= =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E7=BA=BF=E8=BD=A6=E8=BE=86=E7=9A=84icon?= =?UTF-8?q?=E8=A7=A6=E7=82=B9=E8=8C=83=E5=9B=B4=E4=B8=8D=E5=A4=9F=E5=A4=A7?= =?UTF-8?q?=EF=BC=9F=20http://jira.zhidaohulian.com/browse/UI-386=20?= =?UTF-8?q?=E3=80=90=E5=9C=A8=E7=BA=BF=E8=BD=A6=E8=BE=86=E3=80=91ACCON?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E9=9F=B3=E4=B9=90=E6=B0=94=E6=B3=A1=E5=92=8C?= =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=BD=A6=E8=BE=86=E7=AD=89=E5=A4=A7=E4=BA=86?= =?UTF-8?q?=EF=BC=8C=E5=BA=94=E8=AF=A5=E5=9C=A8=E7=BA=BF=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=A4=A7=EF=BC=8C=E9=9F=B3=E4=B9=90=E5=B0=8F=EF=BC=9B=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E5=8D=A1=E7=89=87=E5=90=8E=E5=8F=AF=E4=BB=A5=E5=A4=8D?= =?UTF-8?q?=E4=BD=8D=20http://jira.zhidaohulian.com/browse/UI-388?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/marker/MapMarkerManager.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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 781c232df8..760ec028b5 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 @@ -96,15 +96,15 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag @Override public void onSwitched(int position, String moduleName) { + Logger.d(TAG, "当前C位卡片：" + moduleName); + highlightedMarker(moduleName, false); + mLastHighLightModule = moduleName; if (!isACC_ON) { isACC_ON = true; MogoServiceProvider mMogoServiceProvider = (MogoServiceProvider) ARouter.getInstance().build(ServiceConst.PATH_REFRESH_STRATEGY).navigation(); // 刷新 Marker mMogoServiceProvider.refreshStrategy(); } - Logger.e(TAG, "当前C位卡片：" + moduleName); - highlightedMarker(moduleName, false); - mLastHighLightModule = moduleName; } }); } @@ -119,13 +119,13 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag */ @Override public boolean onMarkerClicked(IMogoMarker marker) { - Logger.i(TAG, "onMarkerClicked 点击了大而全中的Marker：" + marker); + Logger.d(TAG, "onMarkerClicked 点击了大而全中的Marker：" + marker); try { if (lastMarker != null) { // 判断点击的是否是同一个 if (marker.equals(lastMarker)) { - Logger.w(TAG, "onMarkerClicked 与上一次点击的Marker一样，不做处理：" + marker); + Logger.d(TAG, "onMarkerClicked 与上一次点击的Marker一样，不做处理：" + marker); return false; } // 将上次选中 Marker 设置为未选中状态 @@ -207,9 +207,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag setMarkersBig(lastHighLightList.get(markerName)); } } else { - // 将当前卡片选中的气泡放大 - setMarkersBig(currentHighLightList); - // 缩小其他的气泡 Map> lastHighLightList = MarkerServiceHandler.getMarkerManager().getAllMarkers(); for (String markerName : lastHighLightList.keySet()) { @@ -220,6 +217,9 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag } } } + + // 将当前卡片选中的气泡放大 + setMarkersBig(currentHighLightList); } } catch (Exception e) { @@ -466,7 +466,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag // 在ACC on 之后第一次获取到了在线车辆数据，选中最近的一个Marker if (isCheckOnLineData) { if (nearlyMogoMarker != null) { - Logger.w(TAG, "语音搜索触发，默认选中最近的在线车辆：" + nearlyMogoMarker); + Logger.d(TAG, "语音搜索触发，默认选中最近的在线车辆：" + nearlyMogoMarker); // 移动地图到指定位置 MarkerServiceHandler.getMogoStatusManager().setUserInteractionStatus(ServiceConst.TYPE, true, false); MarkerServiceHandler.getMapUIController().moveToCenter(nearlyMogoMarker.getPosition()); @@ -480,7 +480,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag if (isACC_ON && isSynchronousOnLineData) { isSynchronousOnLineData = false; if (nearlyMogoMarker != null) { - Logger.w(TAG, "ACC ON 触发，将附近的在线车辆数据同步给卡片：" + nearlyMogoMarker); + Logger.d(TAG, "ACC ON 触发，将附近的在线车辆数据同步给卡片：" + nearlyMogoMarker); openMarker(nearlyMogoMarker); // 将数据同步给在线用户卡片 MogoDataHandler.getInstance().invoke(ServiceConst.CARD_TYPE_USER_DATA, nearlyMogoMarker); @@ -584,7 +584,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag @Override public void onMsgReceived(final MarkerResponse response) { - Logger.e(TAG, "接收到了地图大而全数据"); + Logger.d(TAG, "接收到了地图大而全数据"); if (!MarkerServiceHandler.getMogoStatusManager().isSearchUIShow() && isACC_ON) { Handler handler = new Handler(Looper.getMainLooper()); handler.post(new Runnable() {