diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapWrapper.java index a1e9cea21c..a0bcb0467b 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapWrapper.java @@ -253,6 +253,11 @@ public class AMapWrapper implements IMogoMap { return true; } + @Override + public float getRoadWidth(double lon, double lat, float angle, boolean isGpsLocation, boolean isRTK) { + return 0; + } + private Context getContext() { return mContext; } diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java index 47c8fcaae2..e87532715c 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java @@ -20,6 +20,7 @@ import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.utils.logger.Logger; import com.zhidaoauto.map.sdk.open.MapAutoApi; import com.zhidaoauto.map.sdk.open.data.MapDataApi; +import com.zhidaoauto.map.sdk.open.data.SinglePointRoadInfo; import com.zhidaoauto.map.sdk.open.marker.Marker; import com.zhidaoauto.map.sdk.open.marker.MarkerOptions; import com.zhidaoauto.map.sdk.open.marker.MultiPointOverlayOptions; @@ -275,6 +276,13 @@ public class AMapWrapper implements IMogoMap { return true; } + @Override + public float getRoadWidth(double lon, double lat, float angle, boolean isGpsLocation, boolean isRTK) { + SinglePointRoadInfo singlePointRoadInfo = MapDataApi.INSTANCE.getSinglePointMatchRoad(lon, lat, angle, isGpsLocation, isRTK); + + return singlePointRoadInfo.getLaneWidth(); + } + private Context getContext() { return mMapView.getContext(); } diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java index 1c648028dd..0cf8a64ecc 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java @@ -130,6 +130,11 @@ public interface IMogoMap { */ float getZoomLevel(); + /** + * 获取道路的宽度 + */ + float getRoadWidth(double lon, double lat, float angle, boolean isGpsLocation, boolean isRTK); + /** * 添加线段 * diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java index 8617c38106..6b64d46920 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java @@ -121,6 +121,7 @@ public interface IMogoMapUIController { */ float getZoomLevel(); + /** * 获取视图东北角坐标 */ diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XWaringManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XWaringManager.java index a5b28a5b8b..2dc4c068fe 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XWaringManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XWaringManager.java @@ -101,7 +101,7 @@ public class V2XWaringManager { MogoLatLng endLatlng1 = new MogoLatLng(40.010906,116.423821); info1.setStartLocation(startLatlng1); info1.setEndLocation(endLatlng1); - V2XServiceManager.getMoGoWarnPolylineManager().drawaWarnPolyline(getContext(), info1); + V2XServiceManager.getMoGoWarnPolylineManager().drawWarnPolyline(getContext(), info1); // adas 每隔一秒传递的他车或行人数据 V2XServiceManager.getmIMogoADASController().addAdasRecognizedDataCallback(resultList -> { @@ -117,7 +117,7 @@ public class V2XWaringManager { MogoLatLng endLatlng = new MogoLatLng(39.971089,116.407384); info.setStartLocation(startLatlng); info.setEndLocation(endLatlng); - V2XServiceManager.getMoGoWarnPolylineManager().drawaWarnPolyline(mContext, info); + V2XServiceManager.getMoGoWarnPolylineManager().drawWarnPolyline(mContext, info); //更新数据 for (ADASRecognizedResult result : resultList) { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/IMoGoWarnPolylineManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/IMoGoWarnPolylineManager.java index 8d3eaa1530..f06da3a68a 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/IMoGoWarnPolylineManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/IMoGoWarnPolylineManager.java @@ -18,7 +18,7 @@ public interface IMoGoWarnPolylineManager extends IProvider { * @param context * @param info */ - void drawaWarnPolyline(Context context, DrawLineInfo info); + void drawWarnPolyline(Context context, DrawLineInfo info); /** * 移除连接线 diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java index f431cd20b2..fc647acaaf 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XCloundDataManager.java @@ -102,7 +102,7 @@ public class MoGoV2XCloundDataManager implements IMoGoV2XCloundDataManager, IMog info.setHeading(latLng.getBearing()); info.setStartLocation(startLatlng); info.setEndLocation(endLatlng); - V2XServiceManager.getMoGoWarnPolylineManager().drawaWarnPolyline(getContext(), info); + V2XServiceManager.getMoGoWarnPolylineManager().drawWarnPolyline(getContext(), info); } } else { Log.e(V2XConst.LOG_NAME_WARN, "mCloundWarningInfo == null"); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoWarnPolylineManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoWarnPolylineManager.java index a5e4a310e5..1b2aa082a1 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoWarnPolylineManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoWarnPolylineManager.java @@ -28,7 +28,7 @@ public class MoGoWarnPolylineManager implements IMoGoWarnPolylineManager { @Override - public void drawaWarnPolyline(Context context, DrawLineInfo info) { + public void drawWarnPolyline(Context context, DrawLineInfo info) { try { if (mMogoPolyline != null) { mMogoPolyline.remove(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java index d458a1195a..f365363897 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java @@ -72,7 +72,7 @@ public class V2XWarningMarker implements IV2XMarker { MogoLatLng endLatLng = new MogoLatLng(mMarkerEntity.getCollisionLat(), mMarkerEntity.getCollisionLon()); drawLineInfo.setStartLocation(slatLng); drawLineInfo.setEndLocation(endLatLng); - V2XServiceManager.getMoGoWarnPolylineManager().drawableWarnPolyline(mContext, drawLineInfo); + V2XServiceManager.getMoGoWarnPolylineManager().drawWarnPolyline(mContext, drawLineInfo); } public void smooth() {