Merge remote-tracking branch 'origin/feature/v1.0.2' into feature/v1.0.2

This commit is contained in:
董宏宇
2020-03-14 18:51:28 +08:00
34 changed files with 209 additions and 54 deletions

View File

@@ -2,6 +2,9 @@ package com.mogo.module.common.entity;
import android.text.TextUtils;
import com.mogo.map.marker.IMogoMarker;
import java.lang.ref.WeakReference;
import java.util.Objects;
/**
@@ -27,6 +30,7 @@ public class MarkerShowEntity {
private Object bindObj;
//Marker 经纬度位置信息
private MarkerLocation markerLocation;
private IMogoMarker mMarker;
public boolean isChecked() {
return isChecked;
@@ -99,6 +103,14 @@ public class MarkerShowEntity {
Objects.equals(markerLocation, that.markerLocation);
}
public void setMarker( IMogoMarker marker ) {
this.mMarker = marker;
}
public IMogoMarker getMarker() {
return mMarker;
}
@Override
public int hashCode() {
return Objects.hash(iconUrl, textContent, markerType, bindObj, markerLocation);