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/MarkerShareMusic.java

@@ -8,8 +8,8 @@ import java.io.Serializable;
 public class MarkerShareMusic implements Serializable {
 
     private String bookInfo;
-    private Double id;
-    private Double likeNumber;
+    private int id;
+    private int likeNumber;
     private MarkerLocation location;
     private String mediaId;
     private String mediaImg;
@@ -17,7 +17,7 @@ public class MarkerShareMusic implements Serializable {
     private String mediaSinger;
     private String mediaUrl;
     private String shareContentText;
-    private Double shareType;
+    private int shareType;
     private String type;
     private MarkerUserInfo userInfo;
 
@@ -29,19 +29,19 @@ public class MarkerShareMusic implements Serializable {
         this.bookInfo = bookInfo;
     }
 
-    public Double getId() {
+    public int getId() {
         return id;
     }
 
-    public void setId(Double id) {
+    public void setId(int id) {
         this.id = id;
     }
 
-    public Double getLikeNumber() {
+    public int getLikeNumber() {
         return likeNumber;
     }
 
-    public void setLikeNumber(Double likeNumber) {
+    public void setLikeNumber(int likeNumber) {
         this.likeNumber = likeNumber;
     }
 
@@ -93,11 +93,11 @@ public class MarkerShareMusic implements Serializable {
         this.shareContentText = shareContentText;
     }
 
-    public Double getShareType() {
+    public int getShareType() {
         return shareType;
     }
 
-    public void setShareType(Double shareType) {
+    public void setShareType(int shareType) {
         this.shareType = shareType;
     }
 

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

@@ -13,7 +13,7 @@ public class MarkerShowEntity {
 
     // false - 没选中，true - 选中
     private boolean isChecked;
-    // icon 地址，例如：头像，唱片图片，探路缩略
+    // icon 地址，例如：头像，唱片图片，探路缩略，可能为空展示默认图
     private String iconUrl;
     // 要展示的文本
     private String textContent;
@@ -77,12 +77,17 @@ public class MarkerShowEntity {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         MarkerShowEntity that = (MarkerShowEntity) o;
-        return bindObj.equals(that.bindObj);
+        return isChecked == that.isChecked &&
+                Objects.equals(iconUrl, that.iconUrl) &&
+                Objects.equals(textContent, that.textContent) &&
+                Objects.equals(markerType, that.markerType) &&
+                Objects.equals(bindObj, that.bindObj) &&
+                Objects.equals(markerLocation, that.markerLocation);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(bindObj);
+        return Objects.hash(isChecked, iconUrl, textContent, markerType, bindObj, markerLocation);
     }
 
     @Override