From 8f2c1b5d3cf7f528f64a1063129a3b9a7c917a96 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 29 Apr 2021 11:33:09 +0800 Subject: [PATCH 1/4] update map_version --- .idea/misc.xml | 2 +- libraries/map-custom/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 97b9126cee..97fd06fd66 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index 8bdbd02da9..ea2b509a19 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -67,7 +67,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.10' + implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.17' // implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4' } From 4730b1cd551b26851c02f5619caf5247fe7a1480 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 29 Apr 2021 11:37:16 +0800 Subject: [PATCH 2/4] amap build variants impl mapUIController interface of getTileId --- .../java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java | 5 +++++ .../main/java/com/mogo/map/impl/amap/AMapViewWrapper.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java index 46a19654e9..97b65ead0b 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java @@ -1037,4 +1037,9 @@ public class AMapNaviViewWrapper implements IMogoMapView, mMapView.getMap().moveCamera( CameraUpdateFactory.changeBearing( bearing ) ); } } + + @Override + public long getTileId(double lon, double lat) { + return 0; + } } diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java index 42d06f624f..baf76eed49 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java @@ -810,4 +810,9 @@ public class AMapViewWrapper implements IMogoMapView, mMapView.getMap().moveCamera( CameraUpdateFactory.changeBearing( bearing ) ); } } + + @Override + public long getTileId(double lon, double lat) { + return 0; + } } From 7dae21e1f8d38096e7be8fc4ebdf96d9e699a471 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 29 Apr 2021 13:56:20 +0800 Subject: [PATCH 3/4] update map version to 8.5.19 --- .idea/misc.xml | 2 +- libraries/map-custom/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 97fd06fd66..733acb1920 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index ea2b509a19..51c5d0954f 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -67,7 +67,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.17' + implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.19' // implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4' } From 8255967ba16d4ddf0b7aaa9207cf775f174bd559 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Sat, 8 May 2021 15:13:23 +0800 Subject: [PATCH 4/4] add new type of adasRecognize is unKnow --- .../common/constants/AdasRecognizedType.java | 35 +++++++++++-------- .../mogo/module/common/drawer/BaseDrawer.java | 11 ++++-- 2 files changed, 30 insertions(+), 16 deletions(-) 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 index ac326ff0d9..ce02d9103a 100644 --- 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 @@ -9,34 +9,37 @@ public */ enum AdasRecognizedType { //背景 - classIdBackground( "background", 0 ), + classIdBackground("background", 0), //人 - classIdPerson( "person", 1 ), + classIdPerson("person", 1), //自行车 - classIdBicycle( "bicycle", 2 ), + classIdBicycle("bicycle", 2), //小轿车 - classIdCar( "car", 3 ), + classIdCar("car", 3), //摩托车 - classIdMoto( "moto", 4 ), + classIdMoto("moto", 4), //红绿灯 - classIdTrafficSign( "traffic_sign", 5 ), + classIdTrafficSign("traffic_sign", 5), //bus - classIdTrafficBus( "traffic_bus", 6 ), + classIdTrafficBus("traffic_bus", 6), //truck - classIdTrafficTruck( "traffic_truck", 8 ), + classIdTrafficTruck("traffic_truck", 8), //stopLine - classIdStopLine("warning_stop_line",9), + classIdStopLine("warning_stop_line", 9), //预警箭头 - classIdWarningArrows("warning_arrows",10); + classIdWarningArrows("warning_arrows", 10), - AdasRecognizedType( int code ) { + //未知物体 + classIdUnKnow("unKnow", 100); + + AdasRecognizedType(int code) { this.code = code; } private String res = ""; private int code = -1; - AdasRecognizedType( String res, int code ) { + AdasRecognizedType(String res, int code) { this.res = res; this.code = code; } @@ -53,14 +56,18 @@ enum AdasRecognizedType { classIdTrafficTruck, classIdStopLine, classIdWarningArrows, + classIdUnKnow, }; public String getRes() { return res; } - public static AdasRecognizedType valueFrom( int code ) { - if ( code >= 0 && code < VAL.length ) { + public static AdasRecognizedType valueFrom(int code) { + if (code == 100) { + return classIdUnKnow; + } + if (code >= 0 && code < VAL.length) { return VAL[code]; } return null; diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java index 960931c3cc..818a3e7b26 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java @@ -194,7 +194,8 @@ class BaseDrawer { || recognizedType == AdasRecognizedType.classIdBicycle || recognizedType == AdasRecognizedType.classIdPerson || recognizedType == AdasRecognizedType.classIdTrafficBus - || recognizedType == AdasRecognizedType.classIdTrafficTruck; + || recognizedType == AdasRecognizedType.classIdTrafficTruck + || recognizedType == AdasRecognizedType.classIdUnKnow; //todo unKnow物体绘制 } /** @@ -207,7 +208,8 @@ class BaseDrawer { AdasRecognizedType recognizedType = AdasRecognizedType.valueFrom(type); return recognizedType != AdasRecognizedType.classIdBicycle && recognizedType != AdasRecognizedType.classIdMoto - && recognizedType != AdasRecognizedType.classIdPerson; + && recognizedType != AdasRecognizedType.classIdPerson + && recognizedType != AdasRecognizedType.classIdUnKnow; //todo unKnow物体不绘制车速 } /** @@ -230,6 +232,8 @@ class BaseDrawer { return R.raw.stopline; } else if (recognizedType == AdasRecognizedType.classIdWarningArrows) { return R.raw.arraw; + } else if (recognizedType == AdasRecognizedType.classIdUnKnow) { //todo unKnow物体3D模型 + return R.raw.othercar; } return R.raw.people; } @@ -248,6 +252,9 @@ class BaseDrawer { if (recognizedType == AdasRecognizedType.classIdTrafficBus) { return "#D8D8D8FF"; } + if (recognizedType == AdasRecognizedType.classIdUnKnow){ //todo unKnow颜色绘制 + return "#FF2894FF"; + } // 距离策略 double[] coordinates = getCurCoordinates(); double distance = CoordinateUtils.calculateLineDistance(lon, lat, coordinates[0], coordinates[1]) * 100;