yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复

Browse Source 
【在线车辆】在线车辆和其他卡片的icon在地图上显示临近时，永远点击的是别人的icon，在线车辆的icon触点范围不够大？
http://jira.zhidaohulian.com/browse/UI-386
【在线车辆】ACCON后，音乐气泡和在线车辆等大了，应该在线车辆大，音乐小；切换卡片后可以复位
http://jira.zhidaohulian.com/browse/UI-388
This commit is contained in:
董宏宇
2020-02-27 20:28:37 +08:00
parent ed7270cd80
commit b25c8ae020
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
View File

@@ -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<String, List<IMogoMarker>> 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() {