diff --git a/.idea/misc.xml b/.idea/misc.xml index 8a8f75bfe2..703e5d4b89 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,7 +5,7 @@ - + diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index c34b0e72b4..54f1962925 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -28,7 +28,7 @@ public class MogoApplication extends AbsMogoApplication { // MogoModulePaths.addModule( new MogoModule( Demo2Constants.TAG, "CARD_DEMO2" ) ); DebugConfig.setNetMode( DebugConfig.NET_MODE_QA ); MogoModulePaths.addModule(new MogoModule(OnLineCarConstants.TAG, "CARD_TYPE_ROAD_ONLINECAR")); - MogoModulePaths.addModule( new MogoModule( TanluConstants.TAG, "CARD_TYPE_ROAD_CODITION" ) ); +// MogoModulePaths.addModule( new MogoModule( TanluConstants.TAG, "CARD_TYPE_ROAD_CODITION" ) ); MogoModulePaths.addModule(new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME)); MogoModulePaths.addModule(new MogoModule( MediaConstants.TAG, MediaConstants.MODULE_TYPE) ); } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerActivitiesScope.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerActivitiesScope.java similarity index 86% rename from modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerActivitiesScope.java rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerActivitiesScope.java index 6d7d99614f..208a79934f 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerActivitiesScope.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerActivitiesScope.java @@ -1,16 +1,13 @@ -package com.mogo.module.service.entity; +package com.mogo.module.common.entity; -import com.google.gson.annotations.Expose; import java.io.Serializable; @SuppressWarnings("unused") public class MarkerActivitiesScope implements Serializable { - @Expose private String content; - @Expose private int isCheck; public String getContent() { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCarChat.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarChat.java similarity index 88% rename from modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCarChat.java rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarChat.java index 772d63fdb4..63a2838939 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCarChat.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarChat.java @@ -1,18 +1,14 @@ -package com.mogo.module.service.entity; +package com.mogo.module.common.entity; -import com.google.gson.annotations.Expose; import java.io.Serializable; @SuppressWarnings("unused") public class MarkerCarChat implements Serializable { - @Expose private MarkerLocation location; - @Expose private String type; - @Expose private MarkerUserInfo userInfo; public MarkerLocation getLocation() { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCarInfo.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java similarity index 87% rename from modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCarInfo.java rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java index 178f9274fa..817e4f31ab 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCarInfo.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java @@ -1,16 +1,13 @@ -package com.mogo.module.service.entity; +package com.mogo.module.common.entity; -import com.google.gson.annotations.Expose; import java.io.Serializable; @SuppressWarnings("unused") public class MarkerCarInfo implements Serializable { - @Expose private String carBrandLogoUrl; - @Expose private String carTypeName; public String getCarBrandLogoUrl() { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCardResult.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCardResult.java similarity index 91% rename from modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCardResult.java rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCardResult.java index fb94087dd8..d90490c832 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCardResult.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCardResult.java @@ -1,20 +1,15 @@ -package com.mogo.module.service.entity; +package com.mogo.module.common.entity; import java.io.Serializable; import java.util.List; -import com.google.gson.annotations.Expose; @SuppressWarnings("unused") public class MarkerCardResult implements Serializable { - @Expose private List carChat; - @Expose private List exploreWay; - @Expose private List onlineCar; - @Expose private List shareMusic; public List getCarChat() { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerDynamicData.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerDynamicData.java similarity index 86% rename from modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerDynamicData.java rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerDynamicData.java index 6c7c35caf8..5bd61f4ddf 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerDynamicData.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerDynamicData.java @@ -1,18 +1,14 @@ -package com.mogo.module.service.entity; +package com.mogo.module.common.entity; -import com.google.gson.annotations.Expose; import java.io.Serializable; @SuppressWarnings("unused") public class MarkerDynamicData implements Serializable { - @Expose private Long id; - @Expose private String name; - @Expose private Long type; public Long getId() { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerExploreWay.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java similarity index 92% rename from modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerExploreWay.java rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java index 6e1ebbca27..32656bf949 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerExploreWay.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java @@ -1,36 +1,35 @@ -package com.mogo.module.service.entity; +package com.mogo.module.common.entity; import java.io.Serializable; import java.util.List; -import com.google.gson.annotations.Expose; @SuppressWarnings("unused") public class MarkerExploreWay implements Serializable { - @Expose + private String addr; - @Expose + private Long canLive; - @Expose + private String cityName; - @Expose + private Long direction; - @Expose + private Long distance; - @Expose + private Long fileType; - @Expose + private Long generateTime; - @Expose + private List items; - @Expose + private MarkerLocation location; - @Expose + private String sn; - @Expose + private String type; - @Expose + private MarkerUserInfo userInfo; public String getAddr() { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerExploreWayItem.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWayItem.java similarity index 86% rename from modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerExploreWayItem.java rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWayItem.java index 00f2cfe667..3f21de5aaa 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerExploreWayItem.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWayItem.java @@ -1,16 +1,15 @@ -package com.mogo.module.service.entity; +package com.mogo.module.common.entity; -import com.google.gson.annotations.Expose; import java.io.Serializable; @SuppressWarnings("unused") public class MarkerExploreWayItem implements Serializable { - @Expose + private String thumbnail; - @Expose + private String url; public String getThumbnail() { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerHobbyDatum.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerHobbyDatum.java similarity index 86% rename from modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerHobbyDatum.java rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerHobbyDatum.java index b7fca8dfe3..d364b2ef3c 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerHobbyDatum.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerHobbyDatum.java @@ -1,16 +1,15 @@ -package com.mogo.module.service.entity; +package com.mogo.module.common.entity; -import com.google.gson.annotations.Expose; import java.io.Serializable; @SuppressWarnings("unused") public class MarkerHobbyDatum implements Serializable { - @Expose + private String content; - @Expose + private int isCheck; public String getContent() { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerLocation.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerLocation.java similarity index 88% rename from modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerLocation.java rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerLocation.java index 5543558a0a..466becae24 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerLocation.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerLocation.java @@ -1,20 +1,15 @@ -package com.mogo.module.service.entity; +package com.mogo.module.common.entity; -import com.google.gson.annotations.Expose; import java.io.Serializable; @SuppressWarnings("unused") public class MarkerLocation implements Serializable { - @Expose private String address; - @Expose private Double angle; - @Expose private Double lat; - @Expose private Double lon; public String getAddress() { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerOnlineCar.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerOnlineCar.java similarity index 93% rename from modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerOnlineCar.java rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerOnlineCar.java index 90bcffad94..69f60c0db1 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerOnlineCar.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerOnlineCar.java @@ -1,30 +1,29 @@ -package com.mogo.module.service.entity; +package com.mogo.module.common.entity; import java.io.Serializable; import java.util.List; -import com.google.gson.annotations.Expose; @SuppressWarnings("unused") public class MarkerOnlineCar implements Serializable { - @Expose + private List activitiesScope; - @Expose + private MarkerCarInfo carInfo; - @Expose + private String compatibility; - @Expose + private MarkerDynamicData dynamicData; - @Expose + private List hobbyData; - @Expose + private Long isFocus; - @Expose + private MarkerLocation location; - @Expose + private String type; - @Expose + private MarkerUserInfo userInfo; public List getActivitiesScope() { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerResponse.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerResponse.java similarity index 88% rename from modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerResponse.java rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerResponse.java index 342443e788..70a07e68cb 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerResponse.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerResponse.java @@ -1,20 +1,15 @@ -package com.mogo.module.service.entity; +package com.mogo.module.common.entity; -import com.google.gson.annotations.Expose; import java.io.Serializable; @SuppressWarnings("unused") public class MarkerResponse implements Serializable { - @Expose private Long code; - @Expose private String msg; - @Expose private MarkerCardResult result; - @Expose private String sign; public Long getCode() { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerShareMusic.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShareMusic.java similarity index 91% rename from modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerShareMusic.java rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShareMusic.java index c668432eea..62dfc8ed20 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerShareMusic.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShareMusic.java @@ -1,26 +1,25 @@ -package com.mogo.module.service.entity; +package com.mogo.module.common.entity; -import com.google.gson.annotations.Expose; import java.io.Serializable; @SuppressWarnings("unused") public class MarkerShareMusic implements Serializable { - @Expose + private Long id; - @Expose + private Long likeNumber; - @Expose + private MarkerLocation location; - @Expose + private String musicName; - @Expose + private String shareContentText; - @Expose + private String type; - @Expose + private MarkerUserInfo userInfo; public Long getId() { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerUserInfo.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java similarity index 94% rename from modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerUserInfo.java rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java index b7b65c078d..d596c0ec55 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerUserInfo.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java @@ -1,7 +1,6 @@ -package com.mogo.module.service.entity; +package com.mogo.module.common.entity; -import com.google.gson.annotations.Expose; import java.io.Serializable; import java.util.Calendar; @@ -9,17 +8,17 @@ import java.util.Calendar; @SuppressWarnings("unused") public class MarkerUserInfo implements Serializable { - @Expose + private int age; - @Expose + private String gender; - @Expose + private String sn; - @Expose + private String userHead; - @Expose + private Long userId; - @Expose + private String userName; public String getAge() { 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 5a7dd2cebe..e34429f83c 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 @@ -9,13 +9,13 @@ import com.mogo.map.marker.IMogoMarkerManager; import com.mogo.map.marker.MogoMarkerOptions; import com.mogo.map.navi.IMogoNavi; import com.mogo.map.uicontroller.IMogoMapUIController; -import com.mogo.module.service.entity.MarkerCarChat; -import com.mogo.module.service.entity.MarkerCardResult; -import com.mogo.module.service.entity.MarkerExploreWay; -import com.mogo.module.service.entity.MarkerLocation; -import com.mogo.module.service.entity.MarkerOnlineCar; -import com.mogo.module.service.entity.MarkerResponse; -import com.mogo.module.service.entity.MarkerShareMusic; +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.MarkerOnlineCar; +import com.mogo.module.common.entity.MarkerResponse; +import com.mogo.module.common.entity.MarkerShareMusic; import com.mogo.module.service.marker.MapMarkerInfoView; import com.mogo.module.service.marker.MapMarkerView; import com.mogo.module.service.marker.MarkerInfoWindowAdapter; @@ -184,6 +184,7 @@ public class MarkerServiceHandler { * * @param markerTag Marker类型 * http://gitlab.zhidaoauto.com/ecos/yycp-service/CarLauncher-Docs/blob/master/%E5%8D%A1%E7%89%87%E7%B1%BB%E5%9E%8B%E5%AE%9A%E4%B9%89.md + * @param bindObject 绑定的对应的数据 * @param markerLocation 要绘制Marker的位置信息 */ public static void drawMapMarker(String markerTag, diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_music_play.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_music_play.png new file mode 100644 index 0000000000..551334ee17 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_music_play.png differ diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml index 0d3b1ffbe3..06fe0259a4 100644 --- a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml +++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml @@ -28,6 +28,17 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + +