yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

将地图Marker对象需要下沉到mogo-module-common

Browse Source
This commit is contained in:
董宏宇
2020-01-10 10:47:05 +08:00
parent d879b09075
commit f37c246956
19 changed files with 74 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

@@ -5,7 +5,7 @@
<configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
</configurations>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

2
app/src/main/java/com/mogo/launcher/MogoApplication.java
View File

@@ -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) );
}

5
modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerActivitiesScope.java → modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerActivitiesScope.java
View File

@@ -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() {

6
modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCarChat.java → modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarChat.java
View File

@@ -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() {

5
modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCarInfo.java → modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java
View File

@@ -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() {

7
modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCardResult.java → modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCardResult.java
View File

@@ -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<MarkerCarChat> carChat;
@Expose
private List<MarkerExploreWay> exploreWay;
@Expose
private List<MarkerOnlineCar> onlineCar;
@Expose
private List<MarkerShareMusic> shareMusic;
public List<MarkerCarChat> getCarChat() {

6
modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerDynamicData.java → modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerDynamicData.java
View File

@@ -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() {

27
modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerExploreWay.java → modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java
View File

@@ -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<MarkerExploreWayItem> items;
@Expose
private MarkerLocation location;
@Expose
private String sn;
@Expose
private String type;
@Expose
private MarkerUserInfo userInfo;
public String getAddr() {

7
modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerExploreWayItem.java → modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWayItem.java
View File

@@ -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() {

7
modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerHobbyDatum.java → modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerHobbyDatum.java
View File

@@ -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() {

7
modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerLocation.java → modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerLocation.java
View File

@@ -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() {

21
modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerOnlineCar.java → modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerOnlineCar.java
View File

@@ -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<MarkerActivitiesScope> activitiesScope;
@Expose
private MarkerCarInfo carInfo;
@Expose
private String compatibility;
@Expose
private MarkerDynamicData dynamicData;
@Expose
private List<MarkerHobbyDatum> hobbyData;
@Expose
private Long isFocus;
@Expose
private MarkerLocation location;
@Expose
private String type;
@Expose
private MarkerUserInfo userInfo;
public List<MarkerActivitiesScope> getActivitiesScope() {

7
modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerResponse.java → modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerResponse.java
View File

@@ -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() {

17
modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerShareMusic.java → modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerShareMusic.java
View File

@@ -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() {

15
modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerUserInfo.java → modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java
View File

@@ -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() {

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

@@ -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,

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_music_play.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

11
modules/mogo-module-service/src/main/res/layout/view_map_marker.xml
View File

@@ -28,6 +28,17 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/ivIconForeground"
android:layout_width="@dimen/dp_76"
android:layout_height="@dimen/dp_76"
android:layout_gravity="center"
android:layout_marginTop="@dimen/dp_6"
android:src="@drawable/icon_map_marker_music_play"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/ivCar"

32
modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java
View File

@@ -14,22 +14,10 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.alibaba.android.arouter.launcher.ARouter;
import com.amap.api.services.core.LatLonPoint;
import com.amap.api.services.route.BusRouteResult;
import com.amap.api.services.route.DrivePath;
import com.amap.api.services.route.DriveRouteResult;
import com.amap.api.services.route.RideRouteResult;
import com.amap.api.services.route.RouteSearch;
import com.amap.api.services.route.WalkRouteResult;
import com.mogo.commons.data.BaseData;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.mvp.IView;
import com.mogo.commons.mvp.MvpFragment;
import com.mogo.commons.mvp.Presenter;
import com.mogo.commons.network.ParamsProvider;
import com.mogo.commons.network.SubscribeImpl;
import com.mogo.map.MogoLatLng;
import com.mogo.map.impl.amap.overlay.DrivingRouteOverlay;
import com.mogo.map.listener.IMogoMapListener;
import com.mogo.map.location.IMogoLocationClient;
import com.mogo.map.location.IMogoLocationListener;
@@ -43,24 +31,17 @@ import com.mogo.map.search.geo.MogoPoiItem;
import com.mogo.map.search.poisearch.IMogoPoiSearchListener;
import com.mogo.map.search.poisearch.MogoPoiResult;
import com.mogo.map.uicontroller.EnumMapUI;
import com.mogo.module.service.entity.MarkerExploreWay;
import com.mogo.module.service.entity.MarkerResponse;
import com.mogo.module.service.network.RefreshApiService;
import com.mogo.module.service.network.RefreshBody;
import com.mogo.module.service.network.RefreshModel;
import com.mogo.module.common.entity.MarkerExploreWay;
import com.mogo.module.common.entity.MarkerResponse;
import com.mogo.module.tanlu.callback.AlongTheWayCallback;
import com.mogo.module.tanlu.callback.RoadLineCallback;
import com.mogo.module.tanlu.callback.VoiceSearchCallback;
import com.mogo.module.tanlu.constant.HttpConst;
import com.mogo.module.tanlu.model.Information;
import com.mogo.module.tanlu.model.InformationAndLiveCarResult;
import com.mogo.module.tanlu.model.PathLineResult;
import com.mogo.module.tanlu.model.TanluModelData;
import com.mogo.module.tanlu.model.VoiceSearchResult;
import com.mogo.module.tanlu.net.TanluApiService;
import com.mogo.module.tanlu.util.ActivityStatusUtil;
import com.mogo.module.tanlu.util.Utils;
import com.mogo.module.tanlu.voice.VoiceController;
import com.mogo.service.MogoServicePaths;
import com.mogo.service.connection.IMogoOnMessageListener;
import com.mogo.service.connection.IMogoSocketManager;
@@ -73,11 +54,8 @@ import com.mogo.module.tanlu.model.event.MarkerInfo;
import com.mogo.module.tanlu.video.FullMediaActivity;
import com.mogo.module.tanlu.video.SimpleCoverVideoPlayer;
import com.mogo.module.tanlu.view.AutoZoomInImageView;
import com.mogo.service.network.IMogoNetwork;
import com.mogo.utils.TipToast;
import com.mogo.utils.logger.Logger;
import com.mogo.utils.network.RequestOptions;
import com.mogo.utils.network.utils.GsonUtil;
import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder;
import org.greenrobot.eventbus.EventBus;
@@ -85,14 +63,8 @@ import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
import static com.mogo.commons.network.Utils.getSn;
import static com.mogo.module.tanlu.util.StringUitlKt.formatDate;
import static com.mogo.module.tanlu.util.Utils.handleDistance;
import static com.mogo.module.tanlu.video.VideoInitKt.initVideo;