diff --git a/modules/mogo-module-common/src/main/aidl/com/mogo/module/common/machinevision/IMachineVisionInterface.aidl b/modules/mogo-module-common/src/main/aidl/com/mogo/module/common/machinevision/IMachineVisionInterface.aidl index c456abaca1..3c929e50fa 100644 --- a/modules/mogo-module-common/src/main/aidl/com/mogo/module/common/machinevision/IMachineVisionInterface.aidl +++ b/modules/mogo-module-common/src/main/aidl/com/mogo/module/common/machinevision/IMachineVisionInterface.aidl @@ -1,6 +1,7 @@ // IMachineVisionInterface.aidl package com.mogo.module.common.machinevision; import com.mogo.module.common.entity.MogoSnapshotSetData; +import com.mogo.service.adas.entity.ADASRecognizedListResult; // Declare any non-default types here with import statements diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/AdasRecognizedType.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/AdasRecognizedType.java new file mode 100644 index 0000000000..0059b0da60 --- /dev/null +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/AdasRecognizedType.java @@ -0,0 +1,27 @@ +package com.mogo.module.common.constants; + +public +/** + * @author congtaowang + * @since 2020/10/27 + *

+ * 描述 + */ +class AdasRecognizedType { + //背景 + public static final int classIdBackground = 0; + //人 + public static final int classIdPerson = 1; + //自行车 + public static final int classIdBicycle = 2; + //小轿车 + public static final int classIdCar = 3; + //摩托车 + public static final int classIdMoto = 4; + //红绿灯 + public static final int classIdTrafficSign = 5; + //bus + public static final int classIdTrafficBus = 6; + //track + public static final int classIdTrafficTruck = 8; +} diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/DataTypes.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/DataTypes.java new file mode 100644 index 0000000000..a7c1934848 --- /dev/null +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/DataTypes.java @@ -0,0 +1,20 @@ +package com.mogo.module.common.constants; + +public +/** + * @author congtaowang + * @since 2020/10/28 + * + * 描述 + */ +class DataTypes { + /** + * adas识别数据 + */ + public static final String TYPE_MARKER_ADAS = "TYPE_MARKER_ADAS"; + + /** + * 云端下发数据 + */ + public static final String TYPE_MARKER_CLOUD_DATA = "TYPE_MARKER_CLOUD_DATA"; +} diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/AdasRecognizedResultDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java similarity index 80% rename from modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/AdasRecognizedResultDrawer.java rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java index 89f8234fee..08d3bc5ba6 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/AdasRecognizedResultDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java @@ -1,4 +1,4 @@ -package com.mogo.module.service.marker; +package com.mogo.module.common.drawer; import android.content.Context; import android.graphics.BitmapFactory; @@ -8,9 +8,10 @@ import com.mogo.map.MogoLatLng; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.MogoMarkerOptions; import com.mogo.module.common.ModuleNames; -import com.mogo.module.service.MarkerServiceHandler; -import com.mogo.module.service.R; -import com.mogo.module.service.ServiceConst; +import com.mogo.module.common.MogoApisHandler; +import com.mogo.module.common.R; +import com.mogo.module.common.constants.AdasRecognizedType; +import com.mogo.module.common.constants.DataTypes; import com.mogo.service.adas.entity.ADASRecognizedListResult; import java.util.ArrayList; @@ -61,7 +62,7 @@ class AdasRecognizedResultDrawer { public void renderAdasRecognizedResult( List< ADASRecognizedListResult > resultList ) { if ( resultList == null || resultList.isEmpty() ) { - MarkerServiceHandler.getApis().getMapServiceApi().getMarkerManager( mContext ).removeMarkers( ServiceConst.TYPE_MARKER_ADAS ); + MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager( mContext ).removeMarkers( DataTypes.TYPE_MARKER_ADAS ); return; } purgeAdasRecognizedData( resultList ); @@ -79,9 +80,9 @@ class AdasRecognizedResultDrawer { mAdasRecognizedMarkersCaches.put( uniqueKey, marker ); } + List< MogoLatLng > points = new ArrayList<>(); if ( recognizedListResult.latLonList != null || recognizedListResult.latLonList.size() > 1 ) { - List< MogoLatLng > points = new ArrayList<>(); for ( int j = 0; j < recognizedListResult.latLonList.size(); j++ ) { ADASRecognizedListResult.LatLon latLon = recognizedListResult.latLonList.get( j ); if ( latLon == null ) { @@ -89,11 +90,19 @@ class AdasRecognizedResultDrawer { } points.add( new MogoLatLng( latLon.lat, latLon.lon ) ); } - if ( points.size() >= 1 ) { - marker.startSmooth( points, 1000 ); - } else { + } else { + // 原来的点和新的点做一个数组进行平滑移动 + MogoLatLng latLng = marker.getPosition(); + ADASRecognizedListResult.LatLon latLon = recognizedListResult.latLonList.get( 0 ); + if ( latLon == null ) { + continue; } + points.add( latLng ); + points.add( new MogoLatLng( latLng.lat, latLon.lon ) ); + } + if ( points.size() >= 1 ) { + marker.startSmooth( points, 1000 ); } } } @@ -143,9 +152,9 @@ class AdasRecognizedResultDrawer { } MogoMarkerOptions options = new MogoMarkerOptions() - .owner( ServiceConst.TYPE_MARKER_ADAS ) + .owner( DataTypes.TYPE_MARKER_ADAS ) .icon( BitmapFactory.decodeResource( mContext.getResources(), R.drawable.map_custom_ic_current_location2 ) ) .position( new MogoLatLng( recognizedListResult.latLonList.get( 0 ).lat, recognizedListResult.latLonList.get( 0 ).lon ) ); - return MarkerServiceHandler.getMapService().getMarkerManager( mContext ).addMarker( ModuleNames.CARD_TYPE_ROAD_CONDITION, options ); + return MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager( mContext ).addMarker( ModuleNames.CARD_TYPE_ROAD_CONDITION, options ); } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/SnapshotSetDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java similarity index 83% rename from modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/SnapshotSetDataDrawer.java rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java index 70b36b7fe2..3b5ca12e41 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/SnapshotSetDataDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java @@ -1,4 +1,4 @@ -package com.mogo.module.service.marker; +package com.mogo.module.common.drawer; import android.content.Context; import android.graphics.BitmapFactory; @@ -8,12 +8,13 @@ import com.mogo.map.MogoLatLng; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.MogoMarkerOptions; import com.mogo.module.common.ModuleNames; +import com.mogo.module.common.MogoApisHandler; +import com.mogo.module.common.R; +import com.mogo.module.common.constants.AdasRecognizedType; +import com.mogo.module.common.constants.DataTypes; import com.mogo.module.common.entity.CloudLocationInfo; import com.mogo.module.common.entity.CloudRoadData; import com.mogo.module.common.entity.MogoSnapshotSetData; -import com.mogo.module.service.MarkerServiceHandler; -import com.mogo.module.service.R; -import com.mogo.module.service.ServiceConst; import java.util.ArrayList; import java.util.HashMap; @@ -67,7 +68,7 @@ class SnapshotSetDataDrawer { * * @param data */ - public void renderSnapshotData( MogoSnapshotSetData data ) { + public void renderSnapshotData( MogoSnapshotSetData data, boolean filterAdasData ) { if ( data == null || data.getAllList() == null || data.getAllList().isEmpty() ) { return; } @@ -76,7 +77,7 @@ class SnapshotSetDataDrawer { if ( cloudRoadData == null ) { continue; } - if ( cloudRoadData.getDistance() < 50 ) { + if ( filterAdasData && cloudRoadData.getDistance() < 50 ) { // 过滤 adas 识别的车辆 continue; } @@ -89,9 +90,9 @@ class SnapshotSetDataDrawer { marker = drawSnapshotDataMarker( cloudRoadData ); mCloudSnapshotMarkersCaches.put( uniqueKey, marker ); } + List< MogoLatLng > points = new ArrayList<>(); if ( cloudRoadData.getCoordinates() != null || cloudRoadData.getCoordinates().size() > 1 ) { - List< MogoLatLng > points = new ArrayList<>(); for ( int j = 0; j < cloudRoadData.getCoordinates().size(); j++ ) { CloudLocationInfo poi = cloudRoadData.getCoordinates().get( j ); if ( poi == null ) { @@ -101,11 +102,13 @@ class SnapshotSetDataDrawer { double lng = poi.getLon(); points.add( new MogoLatLng( lat, lng ) ); } - if ( points.size() >= 1 ) { - marker.startSmooth( points, 1000 ); - } else { - } + } else { + points.add( marker.getPosition() ); + points.add( new MogoLatLng( cloudRoadData.getLat(), cloudRoadData.getLon() ) ); + } + if ( points.size() >= 1 ) { + marker.startSmooth( points, 1000 ); } } } @@ -156,9 +159,9 @@ class SnapshotSetDataDrawer { } MogoMarkerOptions options = new MogoMarkerOptions() - .owner( ServiceConst.TYPE_MARKER_CLOUD_DATA ) + .owner( DataTypes.TYPE_MARKER_CLOUD_DATA ) .icon( BitmapFactory.decodeResource( mContext.getResources(), R.drawable.map_custom_ic_current_location2 ) ) .position( new MogoLatLng( data.getLat(), data.getLon() ) ); - return MarkerServiceHandler.getMapService().getMarkerManager( mContext ).addMarker( ModuleNames.CARD_TYPE_ROAD_CONDITION, options ); + return MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager( mContext ).addMarker( ModuleNames.CARD_TYPE_ROAD_CONDITION, options ); } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index cba98cd5f4..bcffc5c194 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -1,7 +1,6 @@ package com.mogo.module.service.marker; import android.content.Context; -import android.graphics.BitmapFactory; import android.graphics.Rect; import android.text.TextUtils; import android.view.animation.LinearInterpolator; @@ -17,8 +16,8 @@ import com.mogo.map.marker.anim.OnMarkerAnimationListener; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.common.ModuleNames; import com.mogo.module.common.api.CallChatApi; -import com.mogo.module.common.entity.CloudLocationInfo; -import com.mogo.module.common.entity.CloudRoadData; +import com.mogo.module.common.drawer.AdasRecognizedResultDrawer; +import com.mogo.module.common.drawer.SnapshotSetDataDrawer; import com.mogo.module.common.entity.MarkerCarPois; import com.mogo.module.common.entity.MarkerCardResult; import com.mogo.module.common.entity.MarkerExploreWay; @@ -38,7 +37,6 @@ import com.mogo.module.service.network.RefreshModel; import com.mogo.module.service.utils.ViewUtils; import com.mogo.module.service.vrmode.VrModeController; import com.mogo.service.adas.IMogoADASControlStatusChangedListener; -import com.mogo.service.adas.entity.ADASRecognizedListResult; import com.mogo.service.connection.IMogoOnMessageListener; import com.mogo.service.connection.IMogoOnWebSocketMessageListener; import com.mogo.service.connection.WebSocketMsgType; @@ -57,7 +55,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; /** * author : donghongyu @@ -162,7 +159,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, if ( data == null ) { return; } - SnapshotSetDataDrawer.getInstance().renderSnapshotData( data ); + SnapshotSetDataDrawer.getInstance().renderSnapshotData( data, true ); VrModeController.getInstance().renderMogoSnapshotSetData( data ); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java index b8ff8aec5d..17eca2d238 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java @@ -101,6 +101,7 @@ public class V2XMessageListener_401003 implements IMogoOnMessageListener @@ -197,6 +197,28 @@ public class V2XTestConsoleWindow extends ConstraintLayout { LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent); }); + /* + *后方VIP车辆提示 + * */ + btnTriggerRearVIPCarTip.setOnClickListener(v -> { + + }); + /* + *前车急刹 + * */ + btnTriggerVehicleBrakes.setOnClickListener(v -> { + + }); + /* + *后方危险车辆预警 + * */ + btnTriggerRearDangerousVehicles.setOnClickListener(v -> { + + }); + + /* + * 逆向车辆路线预判 + * */ btnTriggerReverseVehicleRoutePrediction.setOnClickListener(v -> { V2XMessageEntity> v2XMessageEntity = TestOnLineCarUtils.getV2XScenarionVRReverseCarData(); @@ -206,7 +228,30 @@ public class V2XTestConsoleWindow extends ConstraintLayout { LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent); }); + /* + *VIP变灯通行 + * */ + btnTriggerVIPLightChange.setOnClickListener(v -> { + }); + + /* + *障碍物绕行 + * */ + btnTriggerObstacleDetour.setOnClickListener(v -> { + + }); + + /* + *行人预警，行人路线预测 + * */ + btnTriggerPedestrianWarning.setOnClickListener(v -> { + + }); + + /* + *拥堵路线推荐 + * */ btnTriggerCongestedRouteRecommendation.setOnClickListener(v -> { V2XMessageEntity v2XMessageEntity = TestOnLineCarUtils.getV2XScenarioPushVR(); @@ -216,6 +261,12 @@ public class V2XTestConsoleWindow extends ConstraintLayout { LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent); }); + /* + *双闪车辆，自动绕行 + * */ + btnTriggerDoubleFlash.setOnClickListener(v -> { + + }); } } diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_behind_danger_car_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_behind_danger_car_data.json new file mode 100644 index 0000000000..9532b6d466 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_behind_danger_car_data.json @@ -0,0 +1,820 @@ +{ + "sceneId": "200003", + "alarmContent": "演示后方危险车辆预警功能", + "expireTime": 30000, + "sceneCategory": 0, + "sceneDescription": "后方危险车辆预警，注意保持车道", + "sceneName": "后方危险车辆预警", + "sceneLevel": 0, + "sceneChannel": "", + "sceneSn": "", + "tts": "发现后方车辆超速，注意保持车道", + "zoom": false, + "zoomScale": 15, + "lat": 40.968678, + "lon": 116.405467, + "userHead": "", + "msgImgUrl": "", + "polyline": [ + [ + 116.737779, + 40.196461 + ], + [ + 116.737689, + 40.196462 + ], + [ + 116.737545, + 40.196464 + ], + [ + 116.737396, + 40.196465 + ], + [ + 116.737215, + 40.196466 + ], + [ + 116.737064, + 40.196467 + ], + [ + 116.736875, + 40.196468 + ], + [ + 116.736744, + 40.196468 + ], + [ + 116.736602, + 40.196469 + ], + [ + 116.736458, + 40.19647 + ], + [ + 116.736304, + 40.196471 + ], + [ + 116.736175, + 40.196472 + ], + [ + 116.736044, + 40.196472 + ], + [ + 116.735883, + 40.196473 + ], + [ + 116.735228, + 40.196477 + ], + [ + 116.735117, + 40.196478 + ], + [ + 116.734994, + 40.196478 + ], + [ + 116.734878, + 40.196479 + ], + [ + 116.734748, + 40.19648 + ], + [ + 116.734636, + 40.196481 + ], + [ + 116.734557, + 40.196481 + ], + [ + 116.734472, + 40.196481 + ], + [ + 116.734392, + 40.196482 + ], + [ + 116.734293, + 40.196482 + ], + [ + 116.734226, + 40.196482 + ], + [ + 116.734138, + 40.196483 + ], + [ + 116.733983, + 40.196484 + ], + [ + 116.733862, + 40.196485 + ], + [ + 116.733725, + 40.196486 + ], + [ + 116.7336, + 40.196486 + ], + [ + 116.733432, + 40.196485 + ], + [ + 116.733331, + 40.196484 + ], + [ + 116.733259, + 40.196482 + ], + [ + 116.733173, + 40.19648 + ], + [ + 116.733106, + 40.196477 + ], + [ + 116.733002, + 40.196471 + ], + [ + 116.732923, + 40.196467 + ], + [ + 116.73282, + 40.196459 + ], + [ + 116.732724, + 40.19645 + ], + [ + 116.73263, + 40.196441 + ], + [ + 116.732529, + 40.19643 + ], + [ + 116.732431, + 40.196419 + ], + [ + 116.732376, + 40.196413 + ], + [ + 116.732295, + 40.196403 + ], + [ + 116.732215, + 40.196391 + ], + [ + 116.732154, + 40.196382 + ], + [ + 116.732076, + 40.196371 + ], + [ + 116.731991, + 40.196356 + ], + [ + 116.731927, + 40.196345 + ], + [ + 116.731847, + 40.19633 + ], + [ + 116.73177, + 40.196316 + ], + [ + 116.731728, + 40.196307 + ], + [ + 116.731664, + 40.196294 + ], + [ + 116.731571, + 40.196274 + ], + [ + 116.731509, + 40.19626 + ], + [ + 116.731435, + 40.196244 + ], + [ + 116.731357, + 40.196224 + ], + [ + 116.7313, + 40.196211 + ], + [ + 116.731226, + 40.196191 + ], + [ + 116.731148, + 40.196171 + ], + [ + 116.731076, + 40.19615 + ], + [ + 116.731016, + 40.196133 + ], + [ + 116.730949, + 40.196113 + ], + [ + 116.730892, + 40.196096 + ], + [ + 116.730827, + 40.196075 + ], + [ + 116.730761, + 40.196053 + ], + [ + 116.730675, + 40.196025 + ], + [ + 116.730616, + 40.196005 + ], + [ + 116.730549, + 40.195981 + ], + [ + 116.730353, + 40.195908 + ], + [ + 116.730214, + 40.195852 + ], + [ + 116.730081, + 40.195798 + ], + [ + 116.729945, + 40.195742 + ], + [ + 116.729836, + 40.195699 + ], + [ + 116.729727, + 40.195659 + ], + [ + 116.729611, + 40.195616 + ], + [ + 116.729486, + 40.195572 + ], + [ + 116.72935, + 40.195529 + ], + [ + 116.729181, + 40.195479 + ], + [ + 116.729013, + 40.195434 + ], + [ + 116.728924, + 40.195412 + ], + [ + 116.72877, + 40.195374 + ], + [ + 116.728622, + 40.195341 + ], + [ + 116.728469, + 40.195308 + ], + [ + 116.728325, + 40.195281 + ], + [ + 116.728174, + 40.195254 + ], + [ + 116.728018, + 40.195229 + ], + [ + 116.727794, + 40.1952 + ], + [ + 116.727599, + 40.195179 + ], + [ + 116.727432, + 40.195165 + ], + [ + 116.727299, + 40.195156 + ], + [ + 116.727073, + 40.195145 + ], + [ + 116.72695, + 40.195142 + ], + [ + 116.726733, + 40.195139 + ], + [ + 116.726488, + 40.19514 + ], + [ + 116.726312, + 40.195141 + ], + [ + 116.726115, + 40.195143 + ], + [ + 116.725869, + 40.195148 + ], + [ + 116.725651, + 40.195155 + ], + [ + 116.72537, + 40.195161 + ], + [ + 116.725188, + 40.195163 + ], + [ + 116.725092, + 40.195162 + ], + [ + 116.725091, + 40.195123 + ], + [ + 116.725335, + 40.195123 + ], + [ + 116.725499, + 40.195123 + ], + [ + 116.72602, + 40.195109 + ], + [ + 116.726235, + 40.195106 + ], + [ + 116.726424, + 40.195105 + ], + [ + 116.726658, + 40.195104 + ], + [ + 116.726733, + 40.195105 + ], + [ + 116.72688, + 40.195106 + ], + [ + 116.72704, + 40.195109 + ], + [ + 116.727217, + 40.195115 + ], + [ + 116.727388, + 40.195124 + ], + [ + 116.727562, + 40.195136 + ], + [ + 116.727735, + 40.195155 + ], + [ + 116.727887, + 40.195174 + ], + [ + 116.727979, + 40.195186 + ], + [ + 116.728056, + 40.195198 + ], + [ + 116.728165, + 40.195216 + ], + [ + 116.728237, + 40.195228 + ], + [ + 116.728345, + 40.195247 + ], + [ + 116.728411, + 40.19526 + ], + [ + 116.728533, + 40.195283 + ], + [ + 116.728589, + 40.195295 + ], + [ + 116.728694, + 40.195318 + ], + [ + 116.728761, + 40.195334 + ], + [ + 116.728868, + 40.19536 + ], + [ + 116.728918, + 40.195372 + ], + [ + 116.729088, + 40.195416 + ], + [ + 116.729262, + 40.195462 + ], + [ + 116.729424, + 40.195512 + ], + [ + 116.729547, + 40.195553 + ], + [ + 116.729584, + 40.195566 + ], + [ + 116.729692, + 40.195606 + ], + [ + 116.729739, + 40.195624 + ], + [ + 116.729844, + 40.195661 + ], + [ + 116.730011, + 40.195726 + ], + [ + 116.73014, + 40.195778 + ], + [ + 116.730309, + 40.195849 + ], + [ + 116.730467, + 40.195911 + ], + [ + 116.730608, + 40.195962 + ], + [ + 116.730673, + 40.195984 + ], + [ + 116.730766, + 40.196015 + ], + [ + 116.730831, + 40.196036 + ], + [ + 116.730935, + 40.196069 + ], + [ + 116.730993, + 40.196087 + ], + [ + 116.731086, + 40.196113 + ], + [ + 116.731164, + 40.196135 + ], + [ + 116.731285, + 40.196165 + ], + [ + 116.731315, + 40.196173 + ], + [ + 116.731434, + 40.196202 + ], + [ + 116.731486, + 40.196214 + ], + [ + 116.731586, + 40.196238 + ], + [ + 116.731652, + 40.196253 + ], + [ + 116.731749, + 40.196273 + ], + [ + 116.731818, + 40.196287 + ], + [ + 116.731924, + 40.196305 + ], + [ + 116.731991, + 40.196317 + ], + [ + 116.732108, + 40.196336 + ], + [ + 116.732269, + 40.196361 + ], + [ + 116.732333, + 40.19637 + ], + [ + 116.732464, + 40.196385 + ], + [ + 116.732507, + 40.19639 + ], + [ + 116.732628, + 40.196404 + ], + [ + 116.732678, + 40.196409 + ], + [ + 116.732784, + 40.196418 + ], + [ + 116.732851, + 40.196424 + ], + [ + 116.732985, + 40.196433 + ], + [ + 116.73314, + 40.196439 + ], + [ + 116.733198, + 40.196441 + ], + [ + 116.733379, + 40.196445 + ], + [ + 116.733548, + 40.196445 + ], + [ + 116.733722, + 40.196445 + ], + [ + 116.733903, + 40.196445 + ], + [ + 116.734081, + 40.196447 + ], + [ + 116.734251, + 40.196446 + ], + [ + 116.734439, + 40.196445 + ], + [ + 116.734624, + 40.196444 + ], + [ + 116.734805, + 40.196442 + ], + [ + 116.734982, + 40.196442 + ], + [ + 116.735164, + 40.196441 + ], + [ + 116.735329, + 40.19644 + ], + [ + 116.735519, + 40.196438 + ], + [ + 116.735682, + 40.196437 + ], + [ + 116.735855, + 40.196437 + ], + [ + 116.736034, + 40.196436 + ], + [ + 116.73621, + 40.196435 + ], + [ + 116.736385, + 40.196433 + ], + [ + 116.736566, + 40.196433 + ], + [ + 116.736742, + 40.196431 + ], + [ + 116.736926, + 40.196431 + ], + [ + 116.737046, + 40.19643 + ], + [ + 116.737173, + 40.19643 + ], + [ + 116.737298, + 40.196429 + ], + [ + 116.737449, + 40.196427 + ], + [ + 116.737582, + 40.196427 + ], + [ + 116.737662, + 40.196425 + ], + [ + 116.737748, + 40.196425 + ], + [ + 116.73778, + 40.196424 + ] + ] +} \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_car_break_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_car_break_data.json new file mode 100644 index 0000000000..346e288e7d --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_car_break_data.json @@ -0,0 +1,820 @@ +{ + "sceneId": "200002", + "alarmContent": "发现前方车辆急刹,请注意减速", + "expireTime": 30000, + "sceneCategory": 0, + "sceneDescription": "前车急刹，注意减速", + "sceneName": "前车急刹", + "sceneLevel": 0, + "sceneChannel": "", + "sceneSn": "", + "tts": "前车急刹注意减速", + "zoom": false, + "zoomScale": 15, + "lat": 40.968678, + "lon": 116.405467, + "userHead": "", + "msgImgUrl": "", + "polyline": [ + [ + 116.737779, + 40.196461 + ], + [ + 116.737689, + 40.196462 + ], + [ + 116.737545, + 40.196464 + ], + [ + 116.737396, + 40.196465 + ], + [ + 116.737215, + 40.196466 + ], + [ + 116.737064, + 40.196467 + ], + [ + 116.736875, + 40.196468 + ], + [ + 116.736744, + 40.196468 + ], + [ + 116.736602, + 40.196469 + ], + [ + 116.736458, + 40.19647 + ], + [ + 116.736304, + 40.196471 + ], + [ + 116.736175, + 40.196472 + ], + [ + 116.736044, + 40.196472 + ], + [ + 116.735883, + 40.196473 + ], + [ + 116.735228, + 40.196477 + ], + [ + 116.735117, + 40.196478 + ], + [ + 116.734994, + 40.196478 + ], + [ + 116.734878, + 40.196479 + ], + [ + 116.734748, + 40.19648 + ], + [ + 116.734636, + 40.196481 + ], + [ + 116.734557, + 40.196481 + ], + [ + 116.734472, + 40.196481 + ], + [ + 116.734392, + 40.196482 + ], + [ + 116.734293, + 40.196482 + ], + [ + 116.734226, + 40.196482 + ], + [ + 116.734138, + 40.196483 + ], + [ + 116.733983, + 40.196484 + ], + [ + 116.733862, + 40.196485 + ], + [ + 116.733725, + 40.196486 + ], + [ + 116.7336, + 40.196486 + ], + [ + 116.733432, + 40.196485 + ], + [ + 116.733331, + 40.196484 + ], + [ + 116.733259, + 40.196482 + ], + [ + 116.733173, + 40.19648 + ], + [ + 116.733106, + 40.196477 + ], + [ + 116.733002, + 40.196471 + ], + [ + 116.732923, + 40.196467 + ], + [ + 116.73282, + 40.196459 + ], + [ + 116.732724, + 40.19645 + ], + [ + 116.73263, + 40.196441 + ], + [ + 116.732529, + 40.19643 + ], + [ + 116.732431, + 40.196419 + ], + [ + 116.732376, + 40.196413 + ], + [ + 116.732295, + 40.196403 + ], + [ + 116.732215, + 40.196391 + ], + [ + 116.732154, + 40.196382 + ], + [ + 116.732076, + 40.196371 + ], + [ + 116.731991, + 40.196356 + ], + [ + 116.731927, + 40.196345 + ], + [ + 116.731847, + 40.19633 + ], + [ + 116.73177, + 40.196316 + ], + [ + 116.731728, + 40.196307 + ], + [ + 116.731664, + 40.196294 + ], + [ + 116.731571, + 40.196274 + ], + [ + 116.731509, + 40.19626 + ], + [ + 116.731435, + 40.196244 + ], + [ + 116.731357, + 40.196224 + ], + [ + 116.7313, + 40.196211 + ], + [ + 116.731226, + 40.196191 + ], + [ + 116.731148, + 40.196171 + ], + [ + 116.731076, + 40.19615 + ], + [ + 116.731016, + 40.196133 + ], + [ + 116.730949, + 40.196113 + ], + [ + 116.730892, + 40.196096 + ], + [ + 116.730827, + 40.196075 + ], + [ + 116.730761, + 40.196053 + ], + [ + 116.730675, + 40.196025 + ], + [ + 116.730616, + 40.196005 + ], + [ + 116.730549, + 40.195981 + ], + [ + 116.730353, + 40.195908 + ], + [ + 116.730214, + 40.195852 + ], + [ + 116.730081, + 40.195798 + ], + [ + 116.729945, + 40.195742 + ], + [ + 116.729836, + 40.195699 + ], + [ + 116.729727, + 40.195659 + ], + [ + 116.729611, + 40.195616 + ], + [ + 116.729486, + 40.195572 + ], + [ + 116.72935, + 40.195529 + ], + [ + 116.729181, + 40.195479 + ], + [ + 116.729013, + 40.195434 + ], + [ + 116.728924, + 40.195412 + ], + [ + 116.72877, + 40.195374 + ], + [ + 116.728622, + 40.195341 + ], + [ + 116.728469, + 40.195308 + ], + [ + 116.728325, + 40.195281 + ], + [ + 116.728174, + 40.195254 + ], + [ + 116.728018, + 40.195229 + ], + [ + 116.727794, + 40.1952 + ], + [ + 116.727599, + 40.195179 + ], + [ + 116.727432, + 40.195165 + ], + [ + 116.727299, + 40.195156 + ], + [ + 116.727073, + 40.195145 + ], + [ + 116.72695, + 40.195142 + ], + [ + 116.726733, + 40.195139 + ], + [ + 116.726488, + 40.19514 + ], + [ + 116.726312, + 40.195141 + ], + [ + 116.726115, + 40.195143 + ], + [ + 116.725869, + 40.195148 + ], + [ + 116.725651, + 40.195155 + ], + [ + 116.72537, + 40.195161 + ], + [ + 116.725188, + 40.195163 + ], + [ + 116.725092, + 40.195162 + ], + [ + 116.725091, + 40.195123 + ], + [ + 116.725335, + 40.195123 + ], + [ + 116.725499, + 40.195123 + ], + [ + 116.72602, + 40.195109 + ], + [ + 116.726235, + 40.195106 + ], + [ + 116.726424, + 40.195105 + ], + [ + 116.726658, + 40.195104 + ], + [ + 116.726733, + 40.195105 + ], + [ + 116.72688, + 40.195106 + ], + [ + 116.72704, + 40.195109 + ], + [ + 116.727217, + 40.195115 + ], + [ + 116.727388, + 40.195124 + ], + [ + 116.727562, + 40.195136 + ], + [ + 116.727735, + 40.195155 + ], + [ + 116.727887, + 40.195174 + ], + [ + 116.727979, + 40.195186 + ], + [ + 116.728056, + 40.195198 + ], + [ + 116.728165, + 40.195216 + ], + [ + 116.728237, + 40.195228 + ], + [ + 116.728345, + 40.195247 + ], + [ + 116.728411, + 40.19526 + ], + [ + 116.728533, + 40.195283 + ], + [ + 116.728589, + 40.195295 + ], + [ + 116.728694, + 40.195318 + ], + [ + 116.728761, + 40.195334 + ], + [ + 116.728868, + 40.19536 + ], + [ + 116.728918, + 40.195372 + ], + [ + 116.729088, + 40.195416 + ], + [ + 116.729262, + 40.195462 + ], + [ + 116.729424, + 40.195512 + ], + [ + 116.729547, + 40.195553 + ], + [ + 116.729584, + 40.195566 + ], + [ + 116.729692, + 40.195606 + ], + [ + 116.729739, + 40.195624 + ], + [ + 116.729844, + 40.195661 + ], + [ + 116.730011, + 40.195726 + ], + [ + 116.73014, + 40.195778 + ], + [ + 116.730309, + 40.195849 + ], + [ + 116.730467, + 40.195911 + ], + [ + 116.730608, + 40.195962 + ], + [ + 116.730673, + 40.195984 + ], + [ + 116.730766, + 40.196015 + ], + [ + 116.730831, + 40.196036 + ], + [ + 116.730935, + 40.196069 + ], + [ + 116.730993, + 40.196087 + ], + [ + 116.731086, + 40.196113 + ], + [ + 116.731164, + 40.196135 + ], + [ + 116.731285, + 40.196165 + ], + [ + 116.731315, + 40.196173 + ], + [ + 116.731434, + 40.196202 + ], + [ + 116.731486, + 40.196214 + ], + [ + 116.731586, + 40.196238 + ], + [ + 116.731652, + 40.196253 + ], + [ + 116.731749, + 40.196273 + ], + [ + 116.731818, + 40.196287 + ], + [ + 116.731924, + 40.196305 + ], + [ + 116.731991, + 40.196317 + ], + [ + 116.732108, + 40.196336 + ], + [ + 116.732269, + 40.196361 + ], + [ + 116.732333, + 40.19637 + ], + [ + 116.732464, + 40.196385 + ], + [ + 116.732507, + 40.19639 + ], + [ + 116.732628, + 40.196404 + ], + [ + 116.732678, + 40.196409 + ], + [ + 116.732784, + 40.196418 + ], + [ + 116.732851, + 40.196424 + ], + [ + 116.732985, + 40.196433 + ], + [ + 116.73314, + 40.196439 + ], + [ + 116.733198, + 40.196441 + ], + [ + 116.733379, + 40.196445 + ], + [ + 116.733548, + 40.196445 + ], + [ + 116.733722, + 40.196445 + ], + [ + 116.733903, + 40.196445 + ], + [ + 116.734081, + 40.196447 + ], + [ + 116.734251, + 40.196446 + ], + [ + 116.734439, + 40.196445 + ], + [ + 116.734624, + 40.196444 + ], + [ + 116.734805, + 40.196442 + ], + [ + 116.734982, + 40.196442 + ], + [ + 116.735164, + 40.196441 + ], + [ + 116.735329, + 40.19644 + ], + [ + 116.735519, + 40.196438 + ], + [ + 116.735682, + 40.196437 + ], + [ + 116.735855, + 40.196437 + ], + [ + 116.736034, + 40.196436 + ], + [ + 116.73621, + 40.196435 + ], + [ + 116.736385, + 40.196433 + ], + [ + 116.736566, + 40.196433 + ], + [ + 116.736742, + 40.196431 + ], + [ + 116.736926, + 40.196431 + ], + [ + 116.737046, + 40.19643 + ], + [ + 116.737173, + 40.19643 + ], + [ + 116.737298, + 40.196429 + ], + [ + 116.737449, + 40.196427 + ], + [ + 116.737582, + 40.196427 + ], + [ + 116.737662, + 40.196425 + ], + [ + 116.737748, + 40.196425 + ], + [ + 116.73778, + 40.196424 + ] + ] +} \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_hehind_vip_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_hehind_vip_data.json index 8f623f4746..b79e0b3eea 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_hehind_vip_data.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_hehind_vip_data.json @@ -1,5 +1,5 @@ { - "sceneId": "200009", + "sceneId": "200001", "alarmContent": "发现后方VIP车辆,请注意避让", "expireTime": 30000, "sceneCategory": 0, @@ -11,12 +11,810 @@ "tts": "发现后方VIP车辆,注意避让", "zoom": false, "zoomScale": 15, - "location": { - "lat": 40.968678, - "lon": 116.405467 - }, "lat": 40.968678, "lon": 116.405467, "userHead": "", - "msgImgUrl": "" + "msgImgUrl": "", + "polyline": [ + [ + 116.737779, + 40.196461 + ], + [ + 116.737689, + 40.196462 + ], + [ + 116.737545, + 40.196464 + ], + [ + 116.737396, + 40.196465 + ], + [ + 116.737215, + 40.196466 + ], + [ + 116.737064, + 40.196467 + ], + [ + 116.736875, + 40.196468 + ], + [ + 116.736744, + 40.196468 + ], + [ + 116.736602, + 40.196469 + ], + [ + 116.736458, + 40.19647 + ], + [ + 116.736304, + 40.196471 + ], + [ + 116.736175, + 40.196472 + ], + [ + 116.736044, + 40.196472 + ], + [ + 116.735883, + 40.196473 + ], + [ + 116.735228, + 40.196477 + ], + [ + 116.735117, + 40.196478 + ], + [ + 116.734994, + 40.196478 + ], + [ + 116.734878, + 40.196479 + ], + [ + 116.734748, + 40.19648 + ], + [ + 116.734636, + 40.196481 + ], + [ + 116.734557, + 40.196481 + ], + [ + 116.734472, + 40.196481 + ], + [ + 116.734392, + 40.196482 + ], + [ + 116.734293, + 40.196482 + ], + [ + 116.734226, + 40.196482 + ], + [ + 116.734138, + 40.196483 + ], + [ + 116.733983, + 40.196484 + ], + [ + 116.733862, + 40.196485 + ], + [ + 116.733725, + 40.196486 + ], + [ + 116.7336, + 40.196486 + ], + [ + 116.733432, + 40.196485 + ], + [ + 116.733331, + 40.196484 + ], + [ + 116.733259, + 40.196482 + ], + [ + 116.733173, + 40.19648 + ], + [ + 116.733106, + 40.196477 + ], + [ + 116.733002, + 40.196471 + ], + [ + 116.732923, + 40.196467 + ], + [ + 116.73282, + 40.196459 + ], + [ + 116.732724, + 40.19645 + ], + [ + 116.73263, + 40.196441 + ], + [ + 116.732529, + 40.19643 + ], + [ + 116.732431, + 40.196419 + ], + [ + 116.732376, + 40.196413 + ], + [ + 116.732295, + 40.196403 + ], + [ + 116.732215, + 40.196391 + ], + [ + 116.732154, + 40.196382 + ], + [ + 116.732076, + 40.196371 + ], + [ + 116.731991, + 40.196356 + ], + [ + 116.731927, + 40.196345 + ], + [ + 116.731847, + 40.19633 + ], + [ + 116.73177, + 40.196316 + ], + [ + 116.731728, + 40.196307 + ], + [ + 116.731664, + 40.196294 + ], + [ + 116.731571, + 40.196274 + ], + [ + 116.731509, + 40.19626 + ], + [ + 116.731435, + 40.196244 + ], + [ + 116.731357, + 40.196224 + ], + [ + 116.7313, + 40.196211 + ], + [ + 116.731226, + 40.196191 + ], + [ + 116.731148, + 40.196171 + ], + [ + 116.731076, + 40.19615 + ], + [ + 116.731016, + 40.196133 + ], + [ + 116.730949, + 40.196113 + ], + [ + 116.730892, + 40.196096 + ], + [ + 116.730827, + 40.196075 + ], + [ + 116.730761, + 40.196053 + ], + [ + 116.730675, + 40.196025 + ], + [ + 116.730616, + 40.196005 + ], + [ + 116.730549, + 40.195981 + ], + [ + 116.730353, + 40.195908 + ], + [ + 116.730214, + 40.195852 + ], + [ + 116.730081, + 40.195798 + ], + [ + 116.729945, + 40.195742 + ], + [ + 116.729836, + 40.195699 + ], + [ + 116.729727, + 40.195659 + ], + [ + 116.729611, + 40.195616 + ], + [ + 116.729486, + 40.195572 + ], + [ + 116.72935, + 40.195529 + ], + [ + 116.729181, + 40.195479 + ], + [ + 116.729013, + 40.195434 + ], + [ + 116.728924, + 40.195412 + ], + [ + 116.72877, + 40.195374 + ], + [ + 116.728622, + 40.195341 + ], + [ + 116.728469, + 40.195308 + ], + [ + 116.728325, + 40.195281 + ], + [ + 116.728174, + 40.195254 + ], + [ + 116.728018, + 40.195229 + ], + [ + 116.727794, + 40.1952 + ], + [ + 116.727599, + 40.195179 + ], + [ + 116.727432, + 40.195165 + ], + [ + 116.727299, + 40.195156 + ], + [ + 116.727073, + 40.195145 + ], + [ + 116.72695, + 40.195142 + ], + [ + 116.726733, + 40.195139 + ], + [ + 116.726488, + 40.19514 + ], + [ + 116.726312, + 40.195141 + ], + [ + 116.726115, + 40.195143 + ], + [ + 116.725869, + 40.195148 + ], + [ + 116.725651, + 40.195155 + ], + [ + 116.72537, + 40.195161 + ], + [ + 116.725188, + 40.195163 + ], + [ + 116.725092, + 40.195162 + ], + [ + 116.725091, + 40.195123 + ], + [ + 116.725335, + 40.195123 + ], + [ + 116.725499, + 40.195123 + ], + [ + 116.72602, + 40.195109 + ], + [ + 116.726235, + 40.195106 + ], + [ + 116.726424, + 40.195105 + ], + [ + 116.726658, + 40.195104 + ], + [ + 116.726733, + 40.195105 + ], + [ + 116.72688, + 40.195106 + ], + [ + 116.72704, + 40.195109 + ], + [ + 116.727217, + 40.195115 + ], + [ + 116.727388, + 40.195124 + ], + [ + 116.727562, + 40.195136 + ], + [ + 116.727735, + 40.195155 + ], + [ + 116.727887, + 40.195174 + ], + [ + 116.727979, + 40.195186 + ], + [ + 116.728056, + 40.195198 + ], + [ + 116.728165, + 40.195216 + ], + [ + 116.728237, + 40.195228 + ], + [ + 116.728345, + 40.195247 + ], + [ + 116.728411, + 40.19526 + ], + [ + 116.728533, + 40.195283 + ], + [ + 116.728589, + 40.195295 + ], + [ + 116.728694, + 40.195318 + ], + [ + 116.728761, + 40.195334 + ], + [ + 116.728868, + 40.19536 + ], + [ + 116.728918, + 40.195372 + ], + [ + 116.729088, + 40.195416 + ], + [ + 116.729262, + 40.195462 + ], + [ + 116.729424, + 40.195512 + ], + [ + 116.729547, + 40.195553 + ], + [ + 116.729584, + 40.195566 + ], + [ + 116.729692, + 40.195606 + ], + [ + 116.729739, + 40.195624 + ], + [ + 116.729844, + 40.195661 + ], + [ + 116.730011, + 40.195726 + ], + [ + 116.73014, + 40.195778 + ], + [ + 116.730309, + 40.195849 + ], + [ + 116.730467, + 40.195911 + ], + [ + 116.730608, + 40.195962 + ], + [ + 116.730673, + 40.195984 + ], + [ + 116.730766, + 40.196015 + ], + [ + 116.730831, + 40.196036 + ], + [ + 116.730935, + 40.196069 + ], + [ + 116.730993, + 40.196087 + ], + [ + 116.731086, + 40.196113 + ], + [ + 116.731164, + 40.196135 + ], + [ + 116.731285, + 40.196165 + ], + [ + 116.731315, + 40.196173 + ], + [ + 116.731434, + 40.196202 + ], + [ + 116.731486, + 40.196214 + ], + [ + 116.731586, + 40.196238 + ], + [ + 116.731652, + 40.196253 + ], + [ + 116.731749, + 40.196273 + ], + [ + 116.731818, + 40.196287 + ], + [ + 116.731924, + 40.196305 + ], + [ + 116.731991, + 40.196317 + ], + [ + 116.732108, + 40.196336 + ], + [ + 116.732269, + 40.196361 + ], + [ + 116.732333, + 40.19637 + ], + [ + 116.732464, + 40.196385 + ], + [ + 116.732507, + 40.19639 + ], + [ + 116.732628, + 40.196404 + ], + [ + 116.732678, + 40.196409 + ], + [ + 116.732784, + 40.196418 + ], + [ + 116.732851, + 40.196424 + ], + [ + 116.732985, + 40.196433 + ], + [ + 116.73314, + 40.196439 + ], + [ + 116.733198, + 40.196441 + ], + [ + 116.733379, + 40.196445 + ], + [ + 116.733548, + 40.196445 + ], + [ + 116.733722, + 40.196445 + ], + [ + 116.733903, + 40.196445 + ], + [ + 116.734081, + 40.196447 + ], + [ + 116.734251, + 40.196446 + ], + [ + 116.734439, + 40.196445 + ], + [ + 116.734624, + 40.196444 + ], + [ + 116.734805, + 40.196442 + ], + [ + 116.734982, + 40.196442 + ], + [ + 116.735164, + 40.196441 + ], + [ + 116.735329, + 40.19644 + ], + [ + 116.735519, + 40.196438 + ], + [ + 116.735682, + 40.196437 + ], + [ + 116.735855, + 40.196437 + ], + [ + 116.736034, + 40.196436 + ], + [ + 116.73621, + 40.196435 + ], + [ + 116.736385, + 40.196433 + ], + [ + 116.736566, + 40.196433 + ], + [ + 116.736742, + 40.196431 + ], + [ + 116.736926, + 40.196431 + ], + [ + 116.737046, + 40.19643 + ], + [ + 116.737173, + 40.19643 + ], + [ + 116.737298, + 40.196429 + ], + [ + 116.737449, + 40.196427 + ], + [ + 116.737582, + 40.196427 + ], + [ + 116.737662, + 40.196425 + ], + [ + 116.737748, + 40.196425 + ], + [ + 116.73778, + 40.196424 + ] + ] } \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_reverse_car_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_reverse_car_data.json index 12af687bdc..293720ccad 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_reverse_car_data.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_reverse_car_data.json @@ -1,5 +1,5 @@ { - "sceneId": "200006", + "sceneId": "200004", "alarmContent": "发现逆向来车,注意减速慢行", "expireTime": 30000, "sceneCategory": 0, @@ -11,12 +11,810 @@ "tts": "对向来车注意减速", "zoom": false, "zoomScale": 15, - "location": { - "lat": 40.968678, - "lon": 116.405467 - }, "lat": 40.968678, "lon": 116.405467, "userHead": "", - "msgImgUrl": "" + "msgImgUrl": "", + "polyline": [ + [ + 116.737779, + 40.196461 + ], + [ + 116.737689, + 40.196462 + ], + [ + 116.737545, + 40.196464 + ], + [ + 116.737396, + 40.196465 + ], + [ + 116.737215, + 40.196466 + ], + [ + 116.737064, + 40.196467 + ], + [ + 116.736875, + 40.196468 + ], + [ + 116.736744, + 40.196468 + ], + [ + 116.736602, + 40.196469 + ], + [ + 116.736458, + 40.19647 + ], + [ + 116.736304, + 40.196471 + ], + [ + 116.736175, + 40.196472 + ], + [ + 116.736044, + 40.196472 + ], + [ + 116.735883, + 40.196473 + ], + [ + 116.735228, + 40.196477 + ], + [ + 116.735117, + 40.196478 + ], + [ + 116.734994, + 40.196478 + ], + [ + 116.734878, + 40.196479 + ], + [ + 116.734748, + 40.19648 + ], + [ + 116.734636, + 40.196481 + ], + [ + 116.734557, + 40.196481 + ], + [ + 116.734472, + 40.196481 + ], + [ + 116.734392, + 40.196482 + ], + [ + 116.734293, + 40.196482 + ], + [ + 116.734226, + 40.196482 + ], + [ + 116.734138, + 40.196483 + ], + [ + 116.733983, + 40.196484 + ], + [ + 116.733862, + 40.196485 + ], + [ + 116.733725, + 40.196486 + ], + [ + 116.7336, + 40.196486 + ], + [ + 116.733432, + 40.196485 + ], + [ + 116.733331, + 40.196484 + ], + [ + 116.733259, + 40.196482 + ], + [ + 116.733173, + 40.19648 + ], + [ + 116.733106, + 40.196477 + ], + [ + 116.733002, + 40.196471 + ], + [ + 116.732923, + 40.196467 + ], + [ + 116.73282, + 40.196459 + ], + [ + 116.732724, + 40.19645 + ], + [ + 116.73263, + 40.196441 + ], + [ + 116.732529, + 40.19643 + ], + [ + 116.732431, + 40.196419 + ], + [ + 116.732376, + 40.196413 + ], + [ + 116.732295, + 40.196403 + ], + [ + 116.732215, + 40.196391 + ], + [ + 116.732154, + 40.196382 + ], + [ + 116.732076, + 40.196371 + ], + [ + 116.731991, + 40.196356 + ], + [ + 116.731927, + 40.196345 + ], + [ + 116.731847, + 40.19633 + ], + [ + 116.73177, + 40.196316 + ], + [ + 116.731728, + 40.196307 + ], + [ + 116.731664, + 40.196294 + ], + [ + 116.731571, + 40.196274 + ], + [ + 116.731509, + 40.19626 + ], + [ + 116.731435, + 40.196244 + ], + [ + 116.731357, + 40.196224 + ], + [ + 116.7313, + 40.196211 + ], + [ + 116.731226, + 40.196191 + ], + [ + 116.731148, + 40.196171 + ], + [ + 116.731076, + 40.19615 + ], + [ + 116.731016, + 40.196133 + ], + [ + 116.730949, + 40.196113 + ], + [ + 116.730892, + 40.196096 + ], + [ + 116.730827, + 40.196075 + ], + [ + 116.730761, + 40.196053 + ], + [ + 116.730675, + 40.196025 + ], + [ + 116.730616, + 40.196005 + ], + [ + 116.730549, + 40.195981 + ], + [ + 116.730353, + 40.195908 + ], + [ + 116.730214, + 40.195852 + ], + [ + 116.730081, + 40.195798 + ], + [ + 116.729945, + 40.195742 + ], + [ + 116.729836, + 40.195699 + ], + [ + 116.729727, + 40.195659 + ], + [ + 116.729611, + 40.195616 + ], + [ + 116.729486, + 40.195572 + ], + [ + 116.72935, + 40.195529 + ], + [ + 116.729181, + 40.195479 + ], + [ + 116.729013, + 40.195434 + ], + [ + 116.728924, + 40.195412 + ], + [ + 116.72877, + 40.195374 + ], + [ + 116.728622, + 40.195341 + ], + [ + 116.728469, + 40.195308 + ], + [ + 116.728325, + 40.195281 + ], + [ + 116.728174, + 40.195254 + ], + [ + 116.728018, + 40.195229 + ], + [ + 116.727794, + 40.1952 + ], + [ + 116.727599, + 40.195179 + ], + [ + 116.727432, + 40.195165 + ], + [ + 116.727299, + 40.195156 + ], + [ + 116.727073, + 40.195145 + ], + [ + 116.72695, + 40.195142 + ], + [ + 116.726733, + 40.195139 + ], + [ + 116.726488, + 40.19514 + ], + [ + 116.726312, + 40.195141 + ], + [ + 116.726115, + 40.195143 + ], + [ + 116.725869, + 40.195148 + ], + [ + 116.725651, + 40.195155 + ], + [ + 116.72537, + 40.195161 + ], + [ + 116.725188, + 40.195163 + ], + [ + 116.725092, + 40.195162 + ], + [ + 116.725091, + 40.195123 + ], + [ + 116.725335, + 40.195123 + ], + [ + 116.725499, + 40.195123 + ], + [ + 116.72602, + 40.195109 + ], + [ + 116.726235, + 40.195106 + ], + [ + 116.726424, + 40.195105 + ], + [ + 116.726658, + 40.195104 + ], + [ + 116.726733, + 40.195105 + ], + [ + 116.72688, + 40.195106 + ], + [ + 116.72704, + 40.195109 + ], + [ + 116.727217, + 40.195115 + ], + [ + 116.727388, + 40.195124 + ], + [ + 116.727562, + 40.195136 + ], + [ + 116.727735, + 40.195155 + ], + [ + 116.727887, + 40.195174 + ], + [ + 116.727979, + 40.195186 + ], + [ + 116.728056, + 40.195198 + ], + [ + 116.728165, + 40.195216 + ], + [ + 116.728237, + 40.195228 + ], + [ + 116.728345, + 40.195247 + ], + [ + 116.728411, + 40.19526 + ], + [ + 116.728533, + 40.195283 + ], + [ + 116.728589, + 40.195295 + ], + [ + 116.728694, + 40.195318 + ], + [ + 116.728761, + 40.195334 + ], + [ + 116.728868, + 40.19536 + ], + [ + 116.728918, + 40.195372 + ], + [ + 116.729088, + 40.195416 + ], + [ + 116.729262, + 40.195462 + ], + [ + 116.729424, + 40.195512 + ], + [ + 116.729547, + 40.195553 + ], + [ + 116.729584, + 40.195566 + ], + [ + 116.729692, + 40.195606 + ], + [ + 116.729739, + 40.195624 + ], + [ + 116.729844, + 40.195661 + ], + [ + 116.730011, + 40.195726 + ], + [ + 116.73014, + 40.195778 + ], + [ + 116.730309, + 40.195849 + ], + [ + 116.730467, + 40.195911 + ], + [ + 116.730608, + 40.195962 + ], + [ + 116.730673, + 40.195984 + ], + [ + 116.730766, + 40.196015 + ], + [ + 116.730831, + 40.196036 + ], + [ + 116.730935, + 40.196069 + ], + [ + 116.730993, + 40.196087 + ], + [ + 116.731086, + 40.196113 + ], + [ + 116.731164, + 40.196135 + ], + [ + 116.731285, + 40.196165 + ], + [ + 116.731315, + 40.196173 + ], + [ + 116.731434, + 40.196202 + ], + [ + 116.731486, + 40.196214 + ], + [ + 116.731586, + 40.196238 + ], + [ + 116.731652, + 40.196253 + ], + [ + 116.731749, + 40.196273 + ], + [ + 116.731818, + 40.196287 + ], + [ + 116.731924, + 40.196305 + ], + [ + 116.731991, + 40.196317 + ], + [ + 116.732108, + 40.196336 + ], + [ + 116.732269, + 40.196361 + ], + [ + 116.732333, + 40.19637 + ], + [ + 116.732464, + 40.196385 + ], + [ + 116.732507, + 40.19639 + ], + [ + 116.732628, + 40.196404 + ], + [ + 116.732678, + 40.196409 + ], + [ + 116.732784, + 40.196418 + ], + [ + 116.732851, + 40.196424 + ], + [ + 116.732985, + 40.196433 + ], + [ + 116.73314, + 40.196439 + ], + [ + 116.733198, + 40.196441 + ], + [ + 116.733379, + 40.196445 + ], + [ + 116.733548, + 40.196445 + ], + [ + 116.733722, + 40.196445 + ], + [ + 116.733903, + 40.196445 + ], + [ + 116.734081, + 40.196447 + ], + [ + 116.734251, + 40.196446 + ], + [ + 116.734439, + 40.196445 + ], + [ + 116.734624, + 40.196444 + ], + [ + 116.734805, + 40.196442 + ], + [ + 116.734982, + 40.196442 + ], + [ + 116.735164, + 40.196441 + ], + [ + 116.735329, + 40.19644 + ], + [ + 116.735519, + 40.196438 + ], + [ + 116.735682, + 40.196437 + ], + [ + 116.735855, + 40.196437 + ], + [ + 116.736034, + 40.196436 + ], + [ + 116.73621, + 40.196435 + ], + [ + 116.736385, + 40.196433 + ], + [ + 116.736566, + 40.196433 + ], + [ + 116.736742, + 40.196431 + ], + [ + 116.736926, + 40.196431 + ], + [ + 116.737046, + 40.19643 + ], + [ + 116.737173, + 40.19643 + ], + [ + 116.737298, + 40.196429 + ], + [ + 116.737449, + 40.196427 + ], + [ + 116.737582, + 40.196427 + ], + [ + 116.737662, + 40.196425 + ], + [ + 116.737748, + 40.196425 + ], + [ + 116.73778, + 40.196424 + ] + ] } \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_vip_light_change_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_vip_light_change_data.json new file mode 100644 index 0000000000..6f813c17c8 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_vip_light_change_data.json @@ -0,0 +1,820 @@ +{ + "sceneId": "200005", + "alarmContent": "让救护车、警车、消防车等VIP车辆通行时免去等待红灯时间，提高vip车辆通过效率", + "expireTime": 30000, + "sceneCategory": 0, + "sceneDescription": "VIP车辆通过可改变路口红绿灯状态", + "sceneName": "VIP变灯通行", + "sceneLevel": 0, + "sceneChannel": "", + "sceneSn": "", + "tts": "已为您变灯，可优先通行", + "zoom": false, + "zoomScale": 15, + "lat": 40.968678, + "lon": 116.405467, + "userHead": "", + "msgImgUrl": "", + "polyline": [ + [ + 116.737779, + 40.196461 + ], + [ + 116.737689, + 40.196462 + ], + [ + 116.737545, + 40.196464 + ], + [ + 116.737396, + 40.196465 + ], + [ + 116.737215, + 40.196466 + ], + [ + 116.737064, + 40.196467 + ], + [ + 116.736875, + 40.196468 + ], + [ + 116.736744, + 40.196468 + ], + [ + 116.736602, + 40.196469 + ], + [ + 116.736458, + 40.19647 + ], + [ + 116.736304, + 40.196471 + ], + [ + 116.736175, + 40.196472 + ], + [ + 116.736044, + 40.196472 + ], + [ + 116.735883, + 40.196473 + ], + [ + 116.735228, + 40.196477 + ], + [ + 116.735117, + 40.196478 + ], + [ + 116.734994, + 40.196478 + ], + [ + 116.734878, + 40.196479 + ], + [ + 116.734748, + 40.19648 + ], + [ + 116.734636, + 40.196481 + ], + [ + 116.734557, + 40.196481 + ], + [ + 116.734472, + 40.196481 + ], + [ + 116.734392, + 40.196482 + ], + [ + 116.734293, + 40.196482 + ], + [ + 116.734226, + 40.196482 + ], + [ + 116.734138, + 40.196483 + ], + [ + 116.733983, + 40.196484 + ], + [ + 116.733862, + 40.196485 + ], + [ + 116.733725, + 40.196486 + ], + [ + 116.7336, + 40.196486 + ], + [ + 116.733432, + 40.196485 + ], + [ + 116.733331, + 40.196484 + ], + [ + 116.733259, + 40.196482 + ], + [ + 116.733173, + 40.19648 + ], + [ + 116.733106, + 40.196477 + ], + [ + 116.733002, + 40.196471 + ], + [ + 116.732923, + 40.196467 + ], + [ + 116.73282, + 40.196459 + ], + [ + 116.732724, + 40.19645 + ], + [ + 116.73263, + 40.196441 + ], + [ + 116.732529, + 40.19643 + ], + [ + 116.732431, + 40.196419 + ], + [ + 116.732376, + 40.196413 + ], + [ + 116.732295, + 40.196403 + ], + [ + 116.732215, + 40.196391 + ], + [ + 116.732154, + 40.196382 + ], + [ + 116.732076, + 40.196371 + ], + [ + 116.731991, + 40.196356 + ], + [ + 116.731927, + 40.196345 + ], + [ + 116.731847, + 40.19633 + ], + [ + 116.73177, + 40.196316 + ], + [ + 116.731728, + 40.196307 + ], + [ + 116.731664, + 40.196294 + ], + [ + 116.731571, + 40.196274 + ], + [ + 116.731509, + 40.19626 + ], + [ + 116.731435, + 40.196244 + ], + [ + 116.731357, + 40.196224 + ], + [ + 116.7313, + 40.196211 + ], + [ + 116.731226, + 40.196191 + ], + [ + 116.731148, + 40.196171 + ], + [ + 116.731076, + 40.19615 + ], + [ + 116.731016, + 40.196133 + ], + [ + 116.730949, + 40.196113 + ], + [ + 116.730892, + 40.196096 + ], + [ + 116.730827, + 40.196075 + ], + [ + 116.730761, + 40.196053 + ], + [ + 116.730675, + 40.196025 + ], + [ + 116.730616, + 40.196005 + ], + [ + 116.730549, + 40.195981 + ], + [ + 116.730353, + 40.195908 + ], + [ + 116.730214, + 40.195852 + ], + [ + 116.730081, + 40.195798 + ], + [ + 116.729945, + 40.195742 + ], + [ + 116.729836, + 40.195699 + ], + [ + 116.729727, + 40.195659 + ], + [ + 116.729611, + 40.195616 + ], + [ + 116.729486, + 40.195572 + ], + [ + 116.72935, + 40.195529 + ], + [ + 116.729181, + 40.195479 + ], + [ + 116.729013, + 40.195434 + ], + [ + 116.728924, + 40.195412 + ], + [ + 116.72877, + 40.195374 + ], + [ + 116.728622, + 40.195341 + ], + [ + 116.728469, + 40.195308 + ], + [ + 116.728325, + 40.195281 + ], + [ + 116.728174, + 40.195254 + ], + [ + 116.728018, + 40.195229 + ], + [ + 116.727794, + 40.1952 + ], + [ + 116.727599, + 40.195179 + ], + [ + 116.727432, + 40.195165 + ], + [ + 116.727299, + 40.195156 + ], + [ + 116.727073, + 40.195145 + ], + [ + 116.72695, + 40.195142 + ], + [ + 116.726733, + 40.195139 + ], + [ + 116.726488, + 40.19514 + ], + [ + 116.726312, + 40.195141 + ], + [ + 116.726115, + 40.195143 + ], + [ + 116.725869, + 40.195148 + ], + [ + 116.725651, + 40.195155 + ], + [ + 116.72537, + 40.195161 + ], + [ + 116.725188, + 40.195163 + ], + [ + 116.725092, + 40.195162 + ], + [ + 116.725091, + 40.195123 + ], + [ + 116.725335, + 40.195123 + ], + [ + 116.725499, + 40.195123 + ], + [ + 116.72602, + 40.195109 + ], + [ + 116.726235, + 40.195106 + ], + [ + 116.726424, + 40.195105 + ], + [ + 116.726658, + 40.195104 + ], + [ + 116.726733, + 40.195105 + ], + [ + 116.72688, + 40.195106 + ], + [ + 116.72704, + 40.195109 + ], + [ + 116.727217, + 40.195115 + ], + [ + 116.727388, + 40.195124 + ], + [ + 116.727562, + 40.195136 + ], + [ + 116.727735, + 40.195155 + ], + [ + 116.727887, + 40.195174 + ], + [ + 116.727979, + 40.195186 + ], + [ + 116.728056, + 40.195198 + ], + [ + 116.728165, + 40.195216 + ], + [ + 116.728237, + 40.195228 + ], + [ + 116.728345, + 40.195247 + ], + [ + 116.728411, + 40.19526 + ], + [ + 116.728533, + 40.195283 + ], + [ + 116.728589, + 40.195295 + ], + [ + 116.728694, + 40.195318 + ], + [ + 116.728761, + 40.195334 + ], + [ + 116.728868, + 40.19536 + ], + [ + 116.728918, + 40.195372 + ], + [ + 116.729088, + 40.195416 + ], + [ + 116.729262, + 40.195462 + ], + [ + 116.729424, + 40.195512 + ], + [ + 116.729547, + 40.195553 + ], + [ + 116.729584, + 40.195566 + ], + [ + 116.729692, + 40.195606 + ], + [ + 116.729739, + 40.195624 + ], + [ + 116.729844, + 40.195661 + ], + [ + 116.730011, + 40.195726 + ], + [ + 116.73014, + 40.195778 + ], + [ + 116.730309, + 40.195849 + ], + [ + 116.730467, + 40.195911 + ], + [ + 116.730608, + 40.195962 + ], + [ + 116.730673, + 40.195984 + ], + [ + 116.730766, + 40.196015 + ], + [ + 116.730831, + 40.196036 + ], + [ + 116.730935, + 40.196069 + ], + [ + 116.730993, + 40.196087 + ], + [ + 116.731086, + 40.196113 + ], + [ + 116.731164, + 40.196135 + ], + [ + 116.731285, + 40.196165 + ], + [ + 116.731315, + 40.196173 + ], + [ + 116.731434, + 40.196202 + ], + [ + 116.731486, + 40.196214 + ], + [ + 116.731586, + 40.196238 + ], + [ + 116.731652, + 40.196253 + ], + [ + 116.731749, + 40.196273 + ], + [ + 116.731818, + 40.196287 + ], + [ + 116.731924, + 40.196305 + ], + [ + 116.731991, + 40.196317 + ], + [ + 116.732108, + 40.196336 + ], + [ + 116.732269, + 40.196361 + ], + [ + 116.732333, + 40.19637 + ], + [ + 116.732464, + 40.196385 + ], + [ + 116.732507, + 40.19639 + ], + [ + 116.732628, + 40.196404 + ], + [ + 116.732678, + 40.196409 + ], + [ + 116.732784, + 40.196418 + ], + [ + 116.732851, + 40.196424 + ], + [ + 116.732985, + 40.196433 + ], + [ + 116.73314, + 40.196439 + ], + [ + 116.733198, + 40.196441 + ], + [ + 116.733379, + 40.196445 + ], + [ + 116.733548, + 40.196445 + ], + [ + 116.733722, + 40.196445 + ], + [ + 116.733903, + 40.196445 + ], + [ + 116.734081, + 40.196447 + ], + [ + 116.734251, + 40.196446 + ], + [ + 116.734439, + 40.196445 + ], + [ + 116.734624, + 40.196444 + ], + [ + 116.734805, + 40.196442 + ], + [ + 116.734982, + 40.196442 + ], + [ + 116.735164, + 40.196441 + ], + [ + 116.735329, + 40.19644 + ], + [ + 116.735519, + 40.196438 + ], + [ + 116.735682, + 40.196437 + ], + [ + 116.735855, + 40.196437 + ], + [ + 116.736034, + 40.196436 + ], + [ + 116.73621, + 40.196435 + ], + [ + 116.736385, + 40.196433 + ], + [ + 116.736566, + 40.196433 + ], + [ + 116.736742, + 40.196431 + ], + [ + 116.736926, + 40.196431 + ], + [ + 116.737046, + 40.19643 + ], + [ + 116.737173, + 40.19643 + ], + [ + 116.737298, + 40.196429 + ], + [ + 116.737449, + 40.196427 + ], + [ + 116.737582, + 40.196427 + ], + [ + 116.737662, + 40.196425 + ], + [ + 116.737748, + 40.196425 + ], + [ + 116.73778, + 40.196424 + ] + ] +} \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_xingren_yujing_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_xingren_yujing_data.json new file mode 100644 index 0000000000..5e06b0a449 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_xingren_yujing_data.json @@ -0,0 +1,820 @@ +{ + "sceneId": "200006", + "alarmContent": "展现行人预测、提前预警能力", + "expireTime": 30000, + "sceneCategory": 0, + "sceneDescription": "行人碰撞预警系统可提前告知通过车辆有行人通过，降低该类型交通事件发生概率", + "sceneName": "行人预警，行人路线预测", + "sceneLevel": 0, + "sceneChannel": "", + "sceneSn": "", + "tts": "检测到路口行人穿行注意避让", + "zoom": false, + "zoomScale": 15, + "lat": 40.968678, + "lon": 116.405467, + "userHead": "", + "msgImgUrl": "", + "polyline": [ + [ + 116.737779, + 40.196461 + ], + [ + 116.737689, + 40.196462 + ], + [ + 116.737545, + 40.196464 + ], + [ + 116.737396, + 40.196465 + ], + [ + 116.737215, + 40.196466 + ], + [ + 116.737064, + 40.196467 + ], + [ + 116.736875, + 40.196468 + ], + [ + 116.736744, + 40.196468 + ], + [ + 116.736602, + 40.196469 + ], + [ + 116.736458, + 40.19647 + ], + [ + 116.736304, + 40.196471 + ], + [ + 116.736175, + 40.196472 + ], + [ + 116.736044, + 40.196472 + ], + [ + 116.735883, + 40.196473 + ], + [ + 116.735228, + 40.196477 + ], + [ + 116.735117, + 40.196478 + ], + [ + 116.734994, + 40.196478 + ], + [ + 116.734878, + 40.196479 + ], + [ + 116.734748, + 40.19648 + ], + [ + 116.734636, + 40.196481 + ], + [ + 116.734557, + 40.196481 + ], + [ + 116.734472, + 40.196481 + ], + [ + 116.734392, + 40.196482 + ], + [ + 116.734293, + 40.196482 + ], + [ + 116.734226, + 40.196482 + ], + [ + 116.734138, + 40.196483 + ], + [ + 116.733983, + 40.196484 + ], + [ + 116.733862, + 40.196485 + ], + [ + 116.733725, + 40.196486 + ], + [ + 116.7336, + 40.196486 + ], + [ + 116.733432, + 40.196485 + ], + [ + 116.733331, + 40.196484 + ], + [ + 116.733259, + 40.196482 + ], + [ + 116.733173, + 40.19648 + ], + [ + 116.733106, + 40.196477 + ], + [ + 116.733002, + 40.196471 + ], + [ + 116.732923, + 40.196467 + ], + [ + 116.73282, + 40.196459 + ], + [ + 116.732724, + 40.19645 + ], + [ + 116.73263, + 40.196441 + ], + [ + 116.732529, + 40.19643 + ], + [ + 116.732431, + 40.196419 + ], + [ + 116.732376, + 40.196413 + ], + [ + 116.732295, + 40.196403 + ], + [ + 116.732215, + 40.196391 + ], + [ + 116.732154, + 40.196382 + ], + [ + 116.732076, + 40.196371 + ], + [ + 116.731991, + 40.196356 + ], + [ + 116.731927, + 40.196345 + ], + [ + 116.731847, + 40.19633 + ], + [ + 116.73177, + 40.196316 + ], + [ + 116.731728, + 40.196307 + ], + [ + 116.731664, + 40.196294 + ], + [ + 116.731571, + 40.196274 + ], + [ + 116.731509, + 40.19626 + ], + [ + 116.731435, + 40.196244 + ], + [ + 116.731357, + 40.196224 + ], + [ + 116.7313, + 40.196211 + ], + [ + 116.731226, + 40.196191 + ], + [ + 116.731148, + 40.196171 + ], + [ + 116.731076, + 40.19615 + ], + [ + 116.731016, + 40.196133 + ], + [ + 116.730949, + 40.196113 + ], + [ + 116.730892, + 40.196096 + ], + [ + 116.730827, + 40.196075 + ], + [ + 116.730761, + 40.196053 + ], + [ + 116.730675, + 40.196025 + ], + [ + 116.730616, + 40.196005 + ], + [ + 116.730549, + 40.195981 + ], + [ + 116.730353, + 40.195908 + ], + [ + 116.730214, + 40.195852 + ], + [ + 116.730081, + 40.195798 + ], + [ + 116.729945, + 40.195742 + ], + [ + 116.729836, + 40.195699 + ], + [ + 116.729727, + 40.195659 + ], + [ + 116.729611, + 40.195616 + ], + [ + 116.729486, + 40.195572 + ], + [ + 116.72935, + 40.195529 + ], + [ + 116.729181, + 40.195479 + ], + [ + 116.729013, + 40.195434 + ], + [ + 116.728924, + 40.195412 + ], + [ + 116.72877, + 40.195374 + ], + [ + 116.728622, + 40.195341 + ], + [ + 116.728469, + 40.195308 + ], + [ + 116.728325, + 40.195281 + ], + [ + 116.728174, + 40.195254 + ], + [ + 116.728018, + 40.195229 + ], + [ + 116.727794, + 40.1952 + ], + [ + 116.727599, + 40.195179 + ], + [ + 116.727432, + 40.195165 + ], + [ + 116.727299, + 40.195156 + ], + [ + 116.727073, + 40.195145 + ], + [ + 116.72695, + 40.195142 + ], + [ + 116.726733, + 40.195139 + ], + [ + 116.726488, + 40.19514 + ], + [ + 116.726312, + 40.195141 + ], + [ + 116.726115, + 40.195143 + ], + [ + 116.725869, + 40.195148 + ], + [ + 116.725651, + 40.195155 + ], + [ + 116.72537, + 40.195161 + ], + [ + 116.725188, + 40.195163 + ], + [ + 116.725092, + 40.195162 + ], + [ + 116.725091, + 40.195123 + ], + [ + 116.725335, + 40.195123 + ], + [ + 116.725499, + 40.195123 + ], + [ + 116.72602, + 40.195109 + ], + [ + 116.726235, + 40.195106 + ], + [ + 116.726424, + 40.195105 + ], + [ + 116.726658, + 40.195104 + ], + [ + 116.726733, + 40.195105 + ], + [ + 116.72688, + 40.195106 + ], + [ + 116.72704, + 40.195109 + ], + [ + 116.727217, + 40.195115 + ], + [ + 116.727388, + 40.195124 + ], + [ + 116.727562, + 40.195136 + ], + [ + 116.727735, + 40.195155 + ], + [ + 116.727887, + 40.195174 + ], + [ + 116.727979, + 40.195186 + ], + [ + 116.728056, + 40.195198 + ], + [ + 116.728165, + 40.195216 + ], + [ + 116.728237, + 40.195228 + ], + [ + 116.728345, + 40.195247 + ], + [ + 116.728411, + 40.19526 + ], + [ + 116.728533, + 40.195283 + ], + [ + 116.728589, + 40.195295 + ], + [ + 116.728694, + 40.195318 + ], + [ + 116.728761, + 40.195334 + ], + [ + 116.728868, + 40.19536 + ], + [ + 116.728918, + 40.195372 + ], + [ + 116.729088, + 40.195416 + ], + [ + 116.729262, + 40.195462 + ], + [ + 116.729424, + 40.195512 + ], + [ + 116.729547, + 40.195553 + ], + [ + 116.729584, + 40.195566 + ], + [ + 116.729692, + 40.195606 + ], + [ + 116.729739, + 40.195624 + ], + [ + 116.729844, + 40.195661 + ], + [ + 116.730011, + 40.195726 + ], + [ + 116.73014, + 40.195778 + ], + [ + 116.730309, + 40.195849 + ], + [ + 116.730467, + 40.195911 + ], + [ + 116.730608, + 40.195962 + ], + [ + 116.730673, + 40.195984 + ], + [ + 116.730766, + 40.196015 + ], + [ + 116.730831, + 40.196036 + ], + [ + 116.730935, + 40.196069 + ], + [ + 116.730993, + 40.196087 + ], + [ + 116.731086, + 40.196113 + ], + [ + 116.731164, + 40.196135 + ], + [ + 116.731285, + 40.196165 + ], + [ + 116.731315, + 40.196173 + ], + [ + 116.731434, + 40.196202 + ], + [ + 116.731486, + 40.196214 + ], + [ + 116.731586, + 40.196238 + ], + [ + 116.731652, + 40.196253 + ], + [ + 116.731749, + 40.196273 + ], + [ + 116.731818, + 40.196287 + ], + [ + 116.731924, + 40.196305 + ], + [ + 116.731991, + 40.196317 + ], + [ + 116.732108, + 40.196336 + ], + [ + 116.732269, + 40.196361 + ], + [ + 116.732333, + 40.19637 + ], + [ + 116.732464, + 40.196385 + ], + [ + 116.732507, + 40.19639 + ], + [ + 116.732628, + 40.196404 + ], + [ + 116.732678, + 40.196409 + ], + [ + 116.732784, + 40.196418 + ], + [ + 116.732851, + 40.196424 + ], + [ + 116.732985, + 40.196433 + ], + [ + 116.73314, + 40.196439 + ], + [ + 116.733198, + 40.196441 + ], + [ + 116.733379, + 40.196445 + ], + [ + 116.733548, + 40.196445 + ], + [ + 116.733722, + 40.196445 + ], + [ + 116.733903, + 40.196445 + ], + [ + 116.734081, + 40.196447 + ], + [ + 116.734251, + 40.196446 + ], + [ + 116.734439, + 40.196445 + ], + [ + 116.734624, + 40.196444 + ], + [ + 116.734805, + 40.196442 + ], + [ + 116.734982, + 40.196442 + ], + [ + 116.735164, + 40.196441 + ], + [ + 116.735329, + 40.19644 + ], + [ + 116.735519, + 40.196438 + ], + [ + 116.735682, + 40.196437 + ], + [ + 116.735855, + 40.196437 + ], + [ + 116.736034, + 40.196436 + ], + [ + 116.73621, + 40.196435 + ], + [ + 116.736385, + 40.196433 + ], + [ + 116.736566, + 40.196433 + ], + [ + 116.736742, + 40.196431 + ], + [ + 116.736926, + 40.196431 + ], + [ + 116.737046, + 40.19643 + ], + [ + 116.737173, + 40.19643 + ], + [ + 116.737298, + 40.196429 + ], + [ + 116.737449, + 40.196427 + ], + [ + 116.737582, + 40.196427 + ], + [ + 116.737662, + 40.196425 + ], + [ + 116.737748, + 40.196425 + ], + [ + 116.73778, + 40.196424 + ] + ] +} \ No newline at end of file diff --git a/modules/mogo-modules-mvision/src/main/java/com/mogo/module/machine/vision/MachineVisionMapViewHandler.java b/modules/mogo-modules-mvision/src/main/java/com/mogo/module/machine/vision/MachineVisionMapViewHandler.java index 53587802d0..87402df068 100644 --- a/modules/mogo-modules-mvision/src/main/java/com/mogo/module/machine/vision/MachineVisionMapViewHandler.java +++ b/modules/mogo-modules-mvision/src/main/java/com/mogo/module/machine/vision/MachineVisionMapViewHandler.java @@ -1,5 +1,6 @@ package com.mogo.module.machine.vision; +import com.mogo.module.common.drawer.SnapshotSetDataDrawer; import com.mogo.module.common.entity.MogoSnapshotSetData; public @@ -50,6 +51,6 @@ class MachineVisionMapViewHandler { if ( mMachineVisionMapView == null ) { return; } - + SnapshotSetDataDrawer.getInstance().renderSnapshotData( data, false ); } } diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/adas/entity/ADASRecognizedListResult.java b/services/mogo-service-api/src/main/java/com/mogo/service/adas/entity/ADASRecognizedListResult.java index df8da8f28e..43cebcf2fe 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/adas/entity/ADASRecognizedListResult.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/adas/entity/ADASRecognizedListResult.java @@ -18,6 +18,7 @@ class ADASRecognizedListResult { public List< LatLon > latLonList; public static class LatLon { + public LatLon( double lat, double lon ) { this.lat = lat; this.lon = lon;