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

Merge branch 'feature/v1.0.0' into feature/v1.0.1

Browse Source
This commit is contained in:
董宏宇
2020-02-27 14:13:22 +08:00
parent 697e15b6c2 9a0d3fa816
commit fa7ed4e978
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <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" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
</project> </project>

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

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