增加了新鲜事儿的Marker样式

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

@@ -11,6 +11,7 @@ public class MarkerCardResult implements Serializable {
     private List<MarkerExploreWay> exploreWay;
     private List<MarkerOnlineCar> onlineCar;
     private List<MarkerShareMusic> shareMusic;
+    private List<MarkerNoveltyInfo> noveltyInfo;
 
     public List<MarkerCarChat> getCarChat() {
         return carChat;
@@ -44,6 +45,14 @@ public class MarkerCardResult implements Serializable {
         this.shareMusic = shareMusic;
     }
 
+    public List<MarkerNoveltyInfo> getNoveltyInfo() {
+        return noveltyInfo;
+    }
+
+    public void setNoveltyInfo(List<MarkerNoveltyInfo> noveltyInfo) {
+        this.noveltyInfo = noveltyInfo;
+    }
+
     @Override
     public String toString() {
         return "MarkerCardResult{" +
@@ -51,6 +60,7 @@ public class MarkerCardResult implements Serializable {
                 ", exploreWay=" + exploreWay +
                 ", onlineCar=" + onlineCar +
                 ", shareMusic=" + shareMusic +
+                ", noveltyInfo=" + noveltyInfo +
                 '}';
     }
 }

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

@@ -0,0 +1,110 @@
+
+package com.mogo.module.common.entity;
+
+public class MarkerNoveltyInfo {
+
+    private ContentData contentData;
+    private MarkerLocation location;
+    private String poiType;
+    private String type;
+    private MarkerUserInfo userInfo;
+
+    public ContentData getContentData() {
+        return contentData;
+    }
+
+    public void setContentData(ContentData contentData) {
+        this.contentData = contentData;
+    }
+
+    public MarkerLocation getLocation() {
+        return location;
+    }
+
+    public void setLocation(MarkerLocation location) {
+        this.location = location;
+    }
+
+    public String getPoiType() {
+        return poiType;
+    }
+
+    public void setPoiType(String poiType) {
+        this.poiType = poiType;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public MarkerUserInfo getUserInfo() {
+        return userInfo;
+    }
+
+    public void setUserInfo(MarkerUserInfo userInfo) {
+        this.userInfo = userInfo;
+    }
+
+    public class ContentData {
+
+        private String content;
+        private String iconUrl;
+        private String imgUrl;
+        private String infoId;
+        private Long likeNum;
+        private String title;
+
+        public String getContent() {
+            return content;
+        }
+
+        public void setContent(String content) {
+            this.content = content;
+        }
+
+        public String getIconUrl() {
+            return iconUrl;
+        }
+
+        public void setIconUrl(String iconUrl) {
+            this.iconUrl = iconUrl;
+        }
+
+        public String getImgUrl() {
+            return imgUrl;
+        }
+
+        public void setImgUrl(String imgUrl) {
+            this.imgUrl = imgUrl;
+        }
+
+        public String getInfoId() {
+            return infoId;
+        }
+
+        public void setInfoId(String infoId) {
+            this.infoId = infoId;
+        }
+
+        public Long getLikeNum() {
+            return likeNum;
+        }
+
+        public void setLikeNum(Long likeNum) {
+            this.likeNum = likeNum;
+        }
+
+        public String getTitle() {
+            return title;
+        }
+
+        public void setTitle(String title) {
+            this.title = title;
+        }
+
+    }
+}

modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java

@@ -14,6 +14,7 @@ import com.mogo.module.common.entity.MarkerCarChat;
 import com.mogo.module.common.entity.MarkerCardResult;
 import com.mogo.module.common.entity.MarkerExploreWay;
 import com.mogo.module.common.entity.MarkerLocation;
+import com.mogo.module.common.entity.MarkerNoveltyInfo;
 import com.mogo.module.common.entity.MarkerOnlineCar;
 import com.mogo.module.common.entity.MarkerResponse;
 import com.mogo.module.common.entity.MarkerShareMusic;
@@ -207,13 +208,14 @@ public class MarkerServiceHandler {
         if (response != null && response.getResult() != null) {
             MarkerCardResult markerCardResult = response.getResult();
 
-            List<MarkerCarChat> carChat = markerCardResult.getCarChat();
+            List<MarkerCarChat> carChatList = markerCardResult.getCarChat();
-            List<MarkerOnlineCar> onlineCar = markerCardResult.getOnlineCar();
+            List<MarkerOnlineCar> onlineCarList = markerCardResult.getOnlineCar();
-            List<MarkerExploreWay> exploreWay = markerCardResult.getExploreWay();
+            List<MarkerExploreWay> exploreWayList = markerCardResult.getExploreWay();
-            List<MarkerShareMusic> shareMusic = markerCardResult.getShareMusic();
+            List<MarkerShareMusic> shareMusicList = markerCardResult.getShareMusic();
+            List<MarkerNoveltyInfo> noveltyInfoList = markerCardResult.getNoveltyInfo();
 
-            if (carChat != null) {
+            if (carChatList != null) {
-                for (MarkerCarChat markerCarChat : carChat) {
+                for (MarkerCarChat markerCarChat : carChatList) {
                     MarkerLocation markerLocation = markerCarChat.getLocation();
 
                     MarkerShowEntity markerShowEntity = new MarkerShowEntity();
@@ -227,8 +229,8 @@ public class MarkerServiceHandler {
                 }
             }
 
-            if (onlineCar != null) {
+            if (onlineCarList != null) {
-                for (MarkerOnlineCar markerOnlineCar : onlineCar) {
+                for (MarkerOnlineCar markerOnlineCar : onlineCarList) {
                     MarkerLocation markerLocation = markerOnlineCar.getLocation();
 
                     MarkerShowEntity markerShowEntity = new MarkerShowEntity();
@@ -242,8 +244,8 @@ public class MarkerServiceHandler {
                 }
             }
 
-            if (exploreWay != null) {
+            if (exploreWayList != null) {
-                for (MarkerExploreWay markerExploreWay : exploreWay) {
+                for (MarkerExploreWay markerExploreWay : exploreWayList) {
                     if (!markerExploreWay.getCanLive()) {
                         MarkerLocation markerLocation = markerExploreWay.getLocation();
 
@@ -258,8 +260,8 @@ public class MarkerServiceHandler {
                 }
             }
 
-            if (shareMusic != null) {
+            if (shareMusicList != null) {
-                for (MarkerShareMusic markerShareMusic : shareMusic) {
+                for (MarkerShareMusic markerShareMusic : shareMusicList) {
                     MarkerLocation markerLocation = markerShareMusic.getLocation();
 
                     MarkerShowEntity markerShowEntity = new MarkerShowEntity();
@@ -273,6 +275,20 @@ public class MarkerServiceHandler {
                 }
             }
 
+            if (noveltyInfoList != null) {
+                for (MarkerNoveltyInfo noveltyInfo : noveltyInfoList) {
+                    MarkerLocation markerLocation = noveltyInfo.getLocation();
+
+                    MarkerShowEntity markerShowEntity = new MarkerShowEntity();
+                    markerShowEntity.setBindObj(noveltyInfo);
+                    markerShowEntity.setMarkerLocation(markerLocation);
+                    markerShowEntity.setMarkerType(noveltyInfo.getType());
+                    markerShowEntity.setTextContent(noveltyInfo.getLocation().getAddress());
+
+                    drawMapMarker(markerShowEntity);
+                }
+            }
+
         }
         getMapUIController().changeZoom(12);
     }

modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java

@@ -95,9 +95,9 @@ public class MapMarkerInfoView extends MapMarkerBaseView {
                     ivUserHead.setVisibility(View.GONE);
                     ivIcon.setVisibility(View.VISIBLE);
 
-                    ivIcon.setImageResource(R.drawable.icon_map_marker_road_block_up);
+                    ivIcon.setImageResource(R.drawable.icon_map_marker_road_check);
-                    clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_blue_info);
+                    clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_green_info);
-                    ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_blue);
+                    ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_green);
                     ivCar.setImageResource(R.drawable.icon_map_marker_location_blue);
                     break;
                 case ServiceConst.CARD_TYPE_SHARE_MUSIC:

modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java

@@ -92,8 +92,8 @@ public class MapMarkerView extends MapMarkerBaseView {
                     ivUserHead.setVisibility(View.GONE);
                     ivIcon.setVisibility(View.VISIBLE);
 
-                    ivIcon.setImageResource(R.drawable.icon_map_marker_road_block_up);
+                    ivIcon.setImageResource(R.drawable.icon_map_marker_road_check);
-                    ivBg.setImageResource(R.drawable.bg_map_marker_blue);
+                    ivBg.setImageResource(R.drawable.bg_map_marker_green);
                     ivCar.setImageResource(R.drawable.icon_map_marker_location_blue);
                     break;
                 case ServiceConst.CARD_TYPE_SHARE_MUSIC: