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 b6b1a61e9b..b2cf600f67 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 @@ -731,6 +731,8 @@ public class AMapViewWrapper implements IMogoMapView, return getMap().getUIController().getTileId(lon,lat); } + private boolean isShowWarn; + @Override public void onLocationChanged(@NotNull com.zhidaoauto.map.sdk.open.location.MogoLocation location) { Location sysLocation = new Location(location.getProvider()); @@ -771,18 +773,20 @@ public class AMapViewWrapper implements IMogoMapView, } } else { // 通过不同的方向类型来改变车模,目前暂定三种模型,drawlevel 1 绿,2 黄,3 红,绿色的时候需要把相应的切换为默认模型 -// Logger.d("liyz", " mAdasResult.drawlevel = " + mAdasResult.drawlevel); // if (mAdasResult != null) { -// if (mAdasResult.drawlevel == 1) { +// Logger.d("liyz", " mAdasResult.drawlevel = " + mAdasResult.drawlevel); +// if (mAdasResult.drawlevel == 1 && isShowWarn) { // mSelfMarker.marker3DIcon(R.raw.car); +// isShowWarn = false; // } else if (mAdasResult.drawlevel == 2) { //不处理 // -// } else if (mAdasResult.drawlevel == 3) { +// } else if (mAdasResult.drawlevel == 3 && !isShowWarn) { // //继续判断相应的方位,目前是只有 前方 TODO -// mSelfMarker.marker3DIcon(R.raw.car); +// mSelfMarker.marker3DIcon(R.raw.qfpz); +// isShowWarn = true; // } // } else { -// mSelfMarker.marker3DIcon(R.raw.car); +//// mSelfMarker.marker3DIcon(R.raw.car); // } } diff --git a/libraries/map-custom/src/main/res/raw/qfpz.n3d b/libraries/map-custom/src/main/res/raw/qfpz.n3d new file mode 100644 index 0000000000..7a0d02ad53 Binary files /dev/null and b/libraries/map-custom/src/main/res/raw/qfpz.n3d differ diff --git a/services/mogo-service/build.gradle b/services/mogo-service/build.gradle index 22268036f0..62b8c6f4c2 100644 --- a/services/mogo-service/build.gradle +++ b/services/mogo-service/build.gradle @@ -42,7 +42,7 @@ dependencies { annotationProcessor rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.adasapi implementation rootProject.ext.dependencies.adasconfigapi - implementation "com.zhidao.support.adas:high:1.1.5.9" + implementation "com.zhidao.support.adas:high:1.1.7.4" if (Boolean.valueOf(RELEASE)) { api rootProject.ext.dependencies.mogomap implementation rootProject.ext.dependencies.mogomapapi 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 1fde5552f1..f8be97107f 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,7 +72,7 @@ public class AdasObjectUtils { result.carId = model.getCarId(); result.dataAccuracy = model.dataAccuracy; result.distance = model.distance; -// result.drawlevel = model.drawlevel; //liyz + result.drawlevel = model.getDrawlevel(); 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 2383d2e35b..09897de20b 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.setDrawlevel(bean.getDrawlevel()); + model.setDrawlevel(bean.getDrawlevel()); //liyz data.add( model );