From f8845daf0e9045ca13dccf9cc606af722002e782 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Wed, 28 Apr 2021 17:24:54 +0800 Subject: [PATCH] update cloundsdk version and opt collision --- gradle.properties | 14 +++++------ .../mogo/map/impl/custom/AMapViewWrapper.java | 24 +++++++++--------- .../common/drawer/V2XWarnDataDrawer.java | 1 - .../service/marker/MapMarkerManager.java | 25 ++++++++----------- .../service/impl/adas/AdasObjectUtils.java | 1 + .../service/impl/adas/MogoADASController.java | 2 +- 6 files changed, 32 insertions(+), 35 deletions(-) diff --git a/gradle.properties b/gradle.properties index c12c099553..170705fc6a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -155,19 +155,19 @@ LOGLIB_VERSION = 1.0.4 ######## MogoAiCloudSDK Version # 网络请求 -MOGO_NETWORK_VERSION=1.0.74 +MOGO_NETWORK_VERSION=1.0.76 # 鉴权 -MOGO_PASSPORT_VERSION=1.0.74 +MOGO_PASSPORT_VERSION=1.0.76 # 常链接 -MOGO_SOCKET_VERSION=1.0.74 +MOGO_SOCKET_VERSION=1.0.76 # 数据采集 -MOGO_REALTIME_VERSION=1.0.74 +MOGO_REALTIME_VERSION=1.0.76 # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.0.74 +MOGO_TANLU_VERSION=1.0.76 # 直播推流 -MOGO_LIVE_VERSION=1.0.74 +MOGO_LIVE_VERSION=1.0.76 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.0.74 +MOGO_TRAFFICLIVE_VERSION=1.0.76 ######## Foundation MogoAiCloud Module # mogoAiCloud apk services diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java index 01f065c298..1efb1d57d5 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java @@ -762,26 +762,26 @@ public class AMapViewWrapper implements IMogoMapView, } } - if (mSelfMarker == null) { //TODO mAdasResultConvert + if (mSelfMarker == null) { try { mSelfMarker = mMapView.getMapAutoViewHelper().getMyLocationStyle().getSelfMarker(); mSelfMarker.setInfoWindowEnable(true); } catch (Exception e) { } -// } else { -// WorkThreadHandler.getInstance().postDelayed(() -> { - -// }, 10000); + } else { // 通过不同的方向类型来改变车模，目前暂定三种模型，drawlevel 1 绿,2 黄,3 红，绿色的时候需要把相应的切换为默认模型 -// if (mAdasResult.type == 1) { -// Log.d("liyz", "-------1------>"); -// mSelfMarker.marker3DIcon(R.raw.car); -// } else if (mAdasResult.type == 2) { //不处理 -// -// } else if (mAdasResult.type == 3) { //切换前方模型 -// //继续判断相应的方位，目前是 前方 TODO +// Logger.d("liyz", " mAdasResult.drawlevel = " + mAdasResult.drawlevel); +// if (mAdasResult != null) { +// if (mAdasResult.drawlevel == 1) { +// mSelfMarker.marker3DIcon(R.raw.car); +// } else if (mAdasResult.drawlevel == 2) { //不处理 // +// } else if (mAdasResult.drawlevel == 3) { +// //继续判断相应的方位，目前是只有 前方 TODO +// mSelfMarker.marker3DIcon(R.raw.car); +// } +// } else { // mSelfMarker.marker3DIcon(R.raw.car); // } } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java index 9067c85ad2..e4db2c864e 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java @@ -95,7 +95,6 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL MogoLatLng newLocation = Trigonometric.getNewLocation(mogoLatLng, 5, 180); IMogoMarker marker = drawMarker(markerShowEntity, modeResType(data.getType())); - Log.d("liyz", "renderWarnData marker != null direction = " + data.getDirection()); //识别物 marker.addDynamicAnchorPosition(new MogoLatLng( data.getDirection() == 1 ? data.getStopLines().get(1).lat : data.getCollisionLat(), 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 ec4f3ff48c..f9286456a8 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 @@ -59,6 +59,7 @@ import com.mogo.utils.ThreadPoolService; import com.mogo.utils.UiThreadHandler; import com.mogo.utils.ViewUtils; import com.mogo.utils.WorkThreadHandler; +import com.mogo.utils.logger.Logger; import com.mogo.utils.network.utils.GsonUtil; import com.zhidao.carchattingprovider.ICallChatResponse; @@ -173,22 +174,18 @@ public class MapMarkerManager implements IMogoMarkerClickListener, // 绘制近景识别到的车辆 AdasRecognizedResultDrawer.getInstance().renderAdasRecognizedResult( resultList ); - //添加自车的定位图标，碰撞只有一个预警,还需要和adas 联调，还需要改 liyz -// ADASRecognizedResult result = null; -// for (int i = 0; i < resultList.size(); i++) { -// result = resultList.get(i); -// if (result.type) { //找出可能碰撞的车 -// result = resultList.get(i); + //添加自车的定位图标，碰撞只有一个预警,还需要和adas 联调， +// for ( ADASRecognizedResult result : resultList) { +// if (result.drawlevel == 3) { //找出可能碰撞的车 +// Logger.d("liyz", "result.drawlevel == 3 ------> "); +//// 绘制他车的线,从列表中查出可能碰撞的车的经纬度(没有或者只有一个)，然后预设20米的长度 +//// 绘制碰撞的他车指引线，需要实时给数据更新 TODO +// drawLimberCollisionPolyline(result); +// //通过这个传值到 AMapViewWrapper，根据数据更新自车的模型数据 +// MarkerServiceHandler.getApis().getMapServiceApi().getMapUIController().setAdasRecognizedResult(result); // } - - //绘制他车的线,从列表中查出可能碰撞的车的经纬度(没有或者只有一个)，然后预设20米的长度 - //绘制碰撞的他车指引线，需要实时给数据更新 TODO -// drawLimberCollisionPolyline(result); // } - -// //通过这个传值到 AMapViewWrapper，根据数据更新自车的模型数据 ADASRecognizedResult -// MarkerServiceHandler.getApis().getMapServiceApi().getMapUIController().setAdasRecognizedResult(result); - + } ); } diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/AdasObjectUtils.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/AdasObjectUtils.java index 1836e7e73e..1fde5552f1 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/AdasObjectUtils.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/AdasObjectUtils.java @@ -72,6 +72,7 @@ public class AdasObjectUtils { result.carId = model.getCarId(); result.dataAccuracy = model.dataAccuracy; result.distance = model.distance; +// result.drawlevel = model.drawlevel; //liyz result.mortonCode = MortonCode.wrapEncodeMorton(result.lon, result.lat); IMogoMapUIController mogoMapUIController = ARouter.getInstance().navigation(IMogoServiceApis.class).getMapServiceApi().getMapUIController(); if (mogoMapUIController != null) { diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index 0d37b62e52..2be321d09d 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -191,7 +191,7 @@ public class MogoADASController implements IMogoADASController { model.setSpeed( bean.getSpeed() ); model.setDataAccuracy( bean.getDataAccuracy() ); model.setDistance( bean.getDistance() ); - +// model.set data.add( model );