yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade adas version

Browse Source
This commit is contained in:
lixiaopeng
2021-05-07 16:06:37 +08:00
parent fc27308975
commit 3d004e4d99
5 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
View File

@@ -731,6 +731,8 @@ public class AMapViewWrapper implements IMogoMapView,
return getMap().getUIController().getTileId(lon,lat); return getMap().getUIController().getTileId(lon,lat);
} }
private boolean isShowWarn;
@Override @Override
public void onLocationChanged(@NotNull com.zhidaoauto.map.sdk.open.location.MogoLocation location) { public void onLocationChanged(@NotNull com.zhidaoauto.map.sdk.open.location.MogoLocation location) {
Location sysLocation = new Location(location.getProvider()); Location sysLocation = new Location(location.getProvider());
@@ -771,18 +773,20 @@ public class AMapViewWrapper implements IMogoMapView,
} }
} else { } else {
// 通过不同的方向类型来改变车模，目前暂定三种模型，drawlevel 1 绿,2 黄,3 红，绿色的时候需要把相应的切换为默认模型 // 通过不同的方向类型来改变车模，目前暂定三种模型，drawlevel 1 绿,2 黄,3 红，绿色的时候需要把相应的切换为默认模型
// Logger.d("liyz", " mAdasResult.drawlevel = " + mAdasResult.drawlevel);
// if (mAdasResult != null) { // if (mAdasResult != null) {
// if (mAdasResult.drawlevel == 1) { // Logger.d("liyz", " mAdasResult.drawlevel = " + mAdasResult.drawlevel);
// if (mAdasResult.drawlevel == 1 && isShowWarn) {
// mSelfMarker.marker3DIcon(R.raw.car); // mSelfMarker.marker3DIcon(R.raw.car);
// isShowWarn = false;
// } else if (mAdasResult.drawlevel == 2) { //不处理 // } else if (mAdasResult.drawlevel == 2) { //不处理
// //
// } else if (mAdasResult.drawlevel == 3) { // } else if (mAdasResult.drawlevel == 3 && !isShowWarn) {
// //继续判断相应的方位，目前是只有 前方 TODO // //继续判断相应的方位，目前是只有 前方 TODO
// mSelfMarker.marker3DIcon(R.raw.car); // mSelfMarker.marker3DIcon(R.raw.qfpz);
// isShowWarn = true;
// } // }
// } else { // } else {
// mSelfMarker.marker3DIcon(R.raw.car); //// mSelfMarker.marker3DIcon(R.raw.car);
// } // }
} }

BIN
libraries/map-custom/src/main/res/raw/qfpz.n3d Normal file
View File

Binary file not shown.

2
services/mogo-service/build.gradle
View File

@@ -42,7 +42,7 @@ dependencies {
annotationProcessor rootProject.ext.dependencies.aroutercompiler annotationProcessor rootProject.ext.dependencies.aroutercompiler
implementation rootProject.ext.dependencies.adasapi implementation rootProject.ext.dependencies.adasapi
implementation rootProject.ext.dependencies.adasconfigapi 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)) { if (Boolean.valueOf(RELEASE)) {
api rootProject.ext.dependencies.mogomap api rootProject.ext.dependencies.mogomap
implementation rootProject.ext.dependencies.mogomapapi implementation rootProject.ext.dependencies.mogomapapi

2
services/mogo-service/src/main/java/com/mogo/service/impl/adas/AdasObjectUtils.java
View File

@@ -72,7 +72,7 @@ public class AdasObjectUtils {
result.carId = model.getCarId(); result.carId = model.getCarId();
result.dataAccuracy = model.dataAccuracy; result.dataAccuracy = model.dataAccuracy;
result.distance = model.distance; result.distance = model.distance;
// result.drawlevel = model.drawlevel; //liyz result.drawlevel = model.getDrawlevel();
result.mortonCode = MortonCode.wrapEncodeMorton(result.lon, result.lat); result.mortonCode = MortonCode.wrapEncodeMorton(result.lon, result.lat);
IMogoMapUIController mogoMapUIController = ARouter.getInstance().navigation(IMogoServiceApis.class).getMapServiceApi().getMapUIController(); IMogoMapUIController mogoMapUIController = ARouter.getInstance().navigation(IMogoServiceApis.class).getMapServiceApi().getMapUIController();
if (mogoMapUIController != null) { if (mogoMapUIController != null) {

2
services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
View File

@@ -191,7 +191,7 @@ public class MogoADASController implements IMogoADASController {
model.setSpeed( bean.getSpeed() ); model.setSpeed( bean.getSpeed() );
model.setDataAccuracy( bean.getDataAccuracy() ); model.setDataAccuracy( bean.getDataAccuracy() );
model.setDistance( bean.getDistance() ); model.setDistance( bean.getDistance() );
// model.setDrawlevel(bean.getDrawlevel()); model.setDrawlevel(bean.getDrawlevel()); //liyz
data.add( model ); data.add( model );