From 8dcb1ce1cdc6de7bc2c1f5b7415bfd2e2496d5cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 10 Jan 2020 15:12:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E9=9F=B3=E4=B9=90=E7=9A=84=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/entity/MarkerShareMusic.java | 93 +++++++++++++++---- .../module/service/MarkerServiceHandler.java | 3 + 2 files changed, 76 insertions(+), 20 deletions(-) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShareMusic.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShareMusic.java index 62dfc8ed20..d4f7dfb32c 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShareMusic.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShareMusic.java @@ -7,34 +7,41 @@ import java.io.Serializable; @SuppressWarnings("unused") public class MarkerShareMusic implements Serializable { - - private Long id; - - private Long likeNumber; - + private String bookInfo; + private long id; + private int likeNumber; private MarkerLocation location; - - private String musicName; - + private String mediaId; + private String mediaImg; + private String mediaName; + private String mediaSinger; + private String mediaUrl; private String shareContentText; - + private int shareType; private String type; - private MarkerUserInfo userInfo; - public Long getId() { + public String getBookInfo() { + return bookInfo; + } + + public void setBookInfo(String bookInfo) { + this.bookInfo = bookInfo; + } + + public long getId() { return id; } - public void setId(Long id) { + public void setId(long id) { this.id = id; } - public Long getLikeNumber() { + public int getLikeNumber() { return likeNumber; } - public void setLikeNumber(Long likeNumber) { + public void setLikeNumber(int likeNumber) { this.likeNumber = likeNumber; } @@ -46,12 +53,44 @@ public class MarkerShareMusic implements Serializable { this.location = location; } - public String getMusicName() { - return musicName; + public String getMediaId() { + return mediaId; } - public void setMusicName(String musicName) { - this.musicName = musicName; + public void setMediaId(String mediaId) { + this.mediaId = mediaId; + } + + public String getMediaImg() { + return mediaImg; + } + + public void setMediaImg(String mediaImg) { + this.mediaImg = mediaImg; + } + + public String getMediaName() { + return mediaName; + } + + public void setMediaName(String mediaName) { + this.mediaName = mediaName; + } + + public String getMediaSinger() { + return mediaSinger; + } + + public void setMediaSinger(String mediaSinger) { + this.mediaSinger = mediaSinger; + } + + public String getMediaUrl() { + return mediaUrl; + } + + public void setMediaUrl(String mediaUrl) { + this.mediaUrl = mediaUrl; } public String getShareContentText() { @@ -62,6 +101,14 @@ public class MarkerShareMusic implements Serializable { this.shareContentText = shareContentText; } + public int getShareType() { + return shareType; + } + + public void setShareType(int shareType) { + this.shareType = shareType; + } + public String getType() { return type; } @@ -81,11 +128,17 @@ public class MarkerShareMusic implements Serializable { @Override public String toString() { return "MarkerShareMusic{" + - "id=" + id + + "bookInfo='" + bookInfo + '\'' + + ", id=" + id + ", likeNumber=" + likeNumber + ", location=" + location + - ", musicName='" + musicName + '\'' + + ", mediaId='" + mediaId + '\'' + + ", mediaImg='" + mediaImg + '\'' + + ", mediaName='" + mediaName + '\'' + + ", mediaSinger='" + mediaSinger + '\'' + + ", mediaUrl='" + mediaUrl + '\'' + ", shareContentText='" + shareContentText + '\'' + + ", shareType=" + shareType + ", type='" + type + '\'' + ", userInfo=" + userInfo + '}'; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java index c9805ebbef..4d405b2371 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java @@ -24,6 +24,7 @@ import com.mogo.service.connection.IMogoOnMessageListener; import com.mogo.service.connection.IMogoSocketManager; import com.mogo.service.imageloader.IMogoImageloader; import com.mogo.service.map.IMogoMapService; +import com.mogo.service.module.IMogoRegisterCenter; import com.mogo.utils.logger.Logger; import java.util.List; @@ -46,6 +47,7 @@ public class MarkerServiceHandler { private static IMogoNavi mNavi; private static IMogoMapUIController mMapUIController; + private static IMogoRegisterCenter mMogoRegisterCenter; private static IMogoImageloader mImageloader; private static IMogoSocketManager mMogoSocketManager; private static MarkerInfoWindowAdapter markerInfoWindowAdapter; @@ -56,6 +58,7 @@ public class MarkerServiceHandler { mContext = context; mMapService = (IMogoMapService) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICES_MAP).navigation(context); mImageloader = (IMogoImageloader) ARouter.getInstance().build(MogoServicePaths.PATH_UTILS_IMAGE_LOADER).navigation(context); + mMogoRegisterCenter = (IMogoRegisterCenter) ARouter.getInstance().build(MogoServicePaths.PATH_REGISTER_CENTER).navigation(context); mMarkerManager = mMapService.getMarkerManager(context); mNavi = mMapService.getNavi(context); markerInfoWindowAdapter = new MarkerInfoWindowAdapter(context, getNavi(), getImageloader());