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

Merge branch 'ml' into dev_merge_shunyi_vr_map

Browse Source
This commit is contained in:
liujing
2020-12-21 13:22:48 +08:00
parent 9cc4abbfe8 9c528128e8
commit 563dfbb0b7
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkMarker.java
View File

@@ -1,5 +1,6 @@
package com.mogo.module.v2x.scenario.scene.park; package com.mogo.module.v2x.scenario.scene.park;
import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.os.Handler; import android.os.Handler;
import android.view.animation.AccelerateInterpolator; import android.view.animation.AccelerateInterpolator;
@@ -15,15 +16,20 @@ import com.mogo.module.common.drawer.marker.MapMarkerAdapter;
import com.mogo.module.common.drawer.marker.RoadConditionInfoWindow3DAdapter; import com.mogo.module.common.drawer.marker.RoadConditionInfoWindow3DAdapter;
import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.entity.MarkerExploreWay;
import com.mogo.module.common.entity.MarkerShowEntity; import com.mogo.module.common.entity.MarkerShowEntity;
import com.mogo.module.common.entity.V2XRoadEventEntity;
import com.mogo.module.service.ServiceConst; import com.mogo.module.service.ServiceConst;
import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.v2x.marker.V2XMarkerAdapter;
import com.mogo.module.v2x.scenario.view.IV2XMarker; import com.mogo.module.v2x.scenario.view.IV2XMarker;
import com.mogo.module.v2x.utils.MarkerUtils; import com.mogo.module.v2x.utils.MarkerUtils;
import com.mogo.utils.ViewUtils; import com.mogo.utils.ViewUtils;
import com.mogo.utils.WorkThreadHandler; import com.mogo.utils.WorkThreadHandler;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import static com.mogo.module.v2x.V2XConst.MODULE_NAME; import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
import static com.mogo.module.v2x.V2XConst.V2X_EVENT_ALARM_POI;
/** /**
* author : donghongyu * author : donghongyu
@@ -66,6 +72,11 @@ public class V2XIllegalParkMarker implements IV2XMarker<List<MarkerExploreWay>>
markerShowEntity.setMarkerLocation(markerExploreWay.getLocation()); markerShowEntity.setMarkerLocation(markerExploreWay.getLocation());
markerShowEntity.setMarkerType(ServiceConst.CARD_TYPE_NOVELTY); markerShowEntity.setMarkerType(ServiceConst.CARD_TYPE_NOVELTY);
// 进行数据转换，用于Marker展示
V2XRoadEventEntity roadEventEntity = new V2XRoadEventEntity();
roadEventEntity.setLocation(markerExploreWay.getLocation());
roadEventEntity.setBindObj(markerExploreWay);
WorkThreadHandler.getInstance().postDelayed(() -> { WorkThreadHandler.getInstance().postDelayed(() -> {
IMogoMarker mogoMarker; IMogoMarker mogoMarker;
if (V2XServiceManager.getMoGoStatusManager().isVrMode()) { if (V2XServiceManager.getMoGoStatusManager().isVrMode()) {
@@ -76,7 +87,7 @@ public class V2XIllegalParkMarker implements IV2XMarker<List<MarkerExploreWay>>
IMarkerView markerView = MapMarkerAdapter.getMarkerView(AbsMogoApplication.getApp(), markerShowEntity, optionsRipple); IMarkerView markerView = MapMarkerAdapter.getMarkerView(AbsMogoApplication.getApp(), markerShowEntity, optionsRipple);
Bitmap bitmap = ViewUtils.fromView(markerView.getView()); Bitmap bitmap = ViewUtils.fromView(markerView.getView());
optionsRipple.icon(bitmap); optionsRipple.icon(bitmap);
mogoMarker = V2XServiceManager.getIMogoMarkerService().drawMarker(markerShowEntity); mogoMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_EVENT_ALARM_POI, optionsRipple);
} }
// 点击监听，天际弹窗展示详情 // 点击监听，天际弹窗展示详情
if (mogoMarker != null) { if (mogoMarker != null) {

4
modules/mogo-module-v2x/src/main/res/raw/scenario_seek_help.json
View File

@@ -3,8 +3,8 @@
{ {
"createTime": 1593678359872, "createTime": 1593678359872,
"distance": 1100, "distance": 1100,
"lat": 39.969057, "lat":39.969055,
"lon": 116.417831, "lon":116.410811,
"sn": "ZD801B1932L00041", "sn": "ZD801B1932L00041",
"targetId": 20007, "targetId": 20007,
"targetName": "故障车", "targetName": "故障车",