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

modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerLocation.java

@@ -8,7 +8,7 @@ import java.io.Serializable;
 public class MarkerLocation implements Serializable {
 
     private String address;
-    private Double angle;
+    private float angle;
     private Double lat;
     private Double lon;
 
@@ -20,11 +20,11 @@ public class MarkerLocation implements Serializable {
         this.address = address;
     }
 
-    public Double getAngle() {
+    public float getAngle() {
         return angle;
     }
 
-    public void setAngle(Double angle) {
+    public void setAngle(float angle) {
         this.angle = angle;
     }
 

modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShowEntity.java

@@ -1,5 +1,7 @@
 package com.mogo.module.common.entity;
 
+import java.util.Objects;
+
 /**
  * author : donghongyu
  * e-mail : 1358506549@qq.com
@@ -73,6 +75,19 @@ public class MarkerShowEntity {
         this.markerLocation = markerLocation;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        MarkerShowEntity that = (MarkerShowEntity) o;
+        return bindObj.equals(that.bindObj);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(bindObj);
+    }
+
     @Override
     public String toString() {
         return "MarkerShowEntity{" +

modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java

@@ -2,23 +2,25 @@
 package com.mogo.module.common.entity;
 
 
+import android.text.TextUtils;
+
 import java.io.Serializable;
 import java.util.Calendar;
 
 @SuppressWarnings("unused")
 public class MarkerUserInfo implements Serializable {
 
-    
+
     private int age;
-    
+
     private String gender;
-    
+
     private String sn;
-    
+
     private String userHead;
-    
+
     private Long userId;
-    
+
     private String userName;
 
     public String getAge() {
@@ -75,6 +77,17 @@ public class MarkerUserInfo implements Serializable {
         this.age = age;
     }
 
+    public int getGenderValue() {
+        if (!TextUtils.isEmpty(gender)) {
+            if ("男".equals(gender)) {
+                return 0;
+            }
+            return 1;
+        } else {
+            return 0;
+        }
+    }
+
     public String getGender() {
         return gender;
     }