Merge branch 'feature/v1.0.1' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into feature/v1.0.1

This commit is contained in:
wangcongtao
2020-02-27 14:31:19 +08:00
2 changed files with 2 additions and 2 deletions

2
.idea/misc.xml generated
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
</project>

View File

@@ -134,7 +134,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag
// 将当前的Marker设置为选中
openMarker(marker);
lastMarker = marker;
// 数据统计代码
final Map<String, Object> properties = new HashMap<>();
@@ -282,6 +281,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag
// 展开气泡
private void openMarker(IMogoMarker mogoMarker) {
if (mogoMarker != null) {
lastMarker = mogoMarker;
Object object = mogoMarker.getObject();
if (object != null) {
MarkerShowEntity markerShowEntity = (MarkerShowEntity) object;