From 06b66354f87f3632e828865f49444d18633a3b26 Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 28 Sep 2022 11:00:23 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=9C=B0=E5=9B=BESDK]=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E8=87=B32.6.0.3-=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96=E9=81=93?= =?UTF-8?q?=E8=B7=AF=E5=90=8D=E7=A7=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- .../src/main/java/com/mogo/map/IMogoMap.java | 11 +++++++++++ .../src/main/java/com/mogo/map/road/RoadNameInfo.kt | 3 +++ .../src/main/java/com/mogo/map/AMapWrapper.java | 11 +++++++++++ 4 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 libraries/mogo-map-api/src/main/java/com/mogo/map/road/RoadNameInfo.kt diff --git a/gradle.properties b/gradle.properties index d8d7879729..b703926da5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -85,7 +85,7 @@ MOGO_LOCATION_VERSION=1.4.3.26 MOGO_TELEMATIC_VERSION=1.4.3.26 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=2.5.1.9 +MAP_SDK_VERSION=2.6.0.3 MAP_SDK_OPERATION_VERSION=1.1.2.4 # websocket WEBSOCKET_VERSION=1.1.7 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 e549b410a1..9f3713f8fa 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 @@ -5,6 +5,7 @@ import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.MogoMarkerOptions; import com.mogo.map.overlay.IMogoPolyline; import com.mogo.map.overlay.MogoPolylineOptions; +import com.mogo.map.road.RoadNameInfo; import com.mogo.map.uicontroller.IMogoMapUIController; import java.util.ArrayList; @@ -185,4 +186,14 @@ public interface IMogoMap { * @return 中心线相关数据 */ CenterLine getCenterLineRangeInfo(double lon, double lat, float angle, float distance); + + + /** + * 根据自车经纬度和航向角，获取道路名称 + * @param lon 经度 + * @param lat 纬度 + * @param angle 航向角 + * @return 道路名称等相关信息 + */ + RoadNameInfo getRoadName(double lon, double lat, float angle); } diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/road/RoadNameInfo.kt b/libraries/mogo-map-api/src/main/java/com/mogo/map/road/RoadNameInfo.kt new file mode 100644 index 0000000000..43ced5f93c --- /dev/null +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/road/RoadNameInfo.kt @@ -0,0 +1,3 @@ +package com.mogo.map.road + +data class RoadNameInfo(val tile_id: String? = "", val road_id: String? = "", val road_name: String? = "") diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java index ee0e175877..734b2f0474 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java @@ -17,6 +17,7 @@ import com.mogo.map.marker.MogoMarkersHandler; import com.mogo.map.overlay.AMapPolylineWrapper; import com.mogo.map.overlay.IMogoPolyline; import com.mogo.map.overlay.MogoPolylineOptions; +import com.mogo.map.road.RoadNameInfo; import com.mogo.map.uicontroller.AMapUIController; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.map.utils.ObjectUtils; @@ -334,6 +335,16 @@ public class AMapWrapper implements IMogoMap { return ret; } + @Override + public RoadNameInfo getRoadName(double lon, double lat, float angle) { + com.zhidaoauto.map.sdk.open.road.RoadNameInfo info = MapDataApi.INSTANCE.getRoadName(lon, lat, angle); + RoadNameInfo ret = null; + if (info != null) { + ret = new RoadNameInfo(info.tile_id, info.road_id, info.road_name); + } + return ret; + } + private List> convert(List points) { if (points == null || points.isEmpty()) { return Collections.emptyList();