From 3d004e4d9943d2d2d4034a559380da8b6986b98c Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 7 May 2021 16:06:37 +0800 Subject: [PATCH] upgrade adas version --- .../mogo/map/impl/custom/AMapViewWrapper.java | 14 +++++++++----- libraries/map-custom/src/main/res/raw/qfpz.n3d | Bin 0 -> 14249 bytes services/mogo-service/build.gradle | 2 +- .../mogo/service/impl/adas/AdasObjectUtils.java | 2 +- .../service/impl/adas/MogoADASController.java | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 libraries/map-custom/src/main/res/raw/qfpz.n3d 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 0000000000000000000000000000000000000000..7a0d02ad5378d1478f406885827fa8ca7c477ebf GIT binary patch literal 14249 zcmeHMe{5Z48GhO#cGbcBnu()52BFj_@zrG@yGl*0yWVfagm88%t&M^LV~~?h-{|a^||eR-ursu`RgO` zpL3IY&+|U#eV_07-h0k>zTPgXTY2{UinqG%sUJoCje7=*g|5DFR9-LeXz$atI8W1(@w{Qy znrE*=oRs5v^TvF`aG3mS|Ej@sv39;cKF9NhS!?=Uhd3$6^QWR(%s#}i_%fZyVe&~i zo;S=|^XzqqlX5(7-k5I~4wGNBz6K{=Ug(d{@w{Qyn!eW|PRjB8H$Pj0i>|C=w$q6m zCZCk!dBdzV&t8W(DaZ5XjroS*F!{~Hz^+Dmj^%jXFl$ZU>kud9cz)pX!0~~F{+JHO zHB6nP9M2nOt`kud9cz)+27fQOnOotu} zQzt3M^M+Y#p1lrnQjX`%8}kjrVe(5CT_|aN_Boz6%v#g;I>bpio^O19uB7$Zbm+k_ zb&_&CZirx;u=GNYevTnH)Q9Rrdg5!P7kUioiLVXy zp?W{Z5G=jWqn~344)vk>ke>Kj>4hFcdg5zCeW>2gF$7C5^yudpfM3P#>!Ia}2@K3qATdhTu>iZ&&?y=79P?08gI-F8w3$&%Xj4&j8{TPyY?*{|(U7 z2>fCNFxvz?y9yY-9yq_W$}7HOGjOCHI7!`yPt)xz(9R!q4?hoF&RD$S^W-KuzI^C> zoL3z8rFi2n`L`F}@~il^CxIW#0P-cDKb!zoEvfQ~Pm;fdKS^mk`TX|dz|Ytp@rs|M zb{G32A37iB6~}!k9(#m+J_g9I;>IKVP4v6$Tg8`r{^efa`^&1lV%!IeF9I~4d>)+! z&e5xQ#aj;p_dN#4ht9`&#c^MX&wT~B=^Ompx#CxG_8@RIJ;|4RUi?!ae?^s7{Lni4WRMlbGi?hJ5=Qr_Y{B&ck{cc^iOqhUUA%);*&Q3dxrq|RlMpmz;6e5 zUsQa_=j$&4qo1qtiXS@*EMtwvlh51+;K%&ER=nc=P3*xqARjs(=M~3&DL(UYpzS)| zlNG;;k9Po1T?@#Ue7;Jb4}G!9D?Z5ertJ&7mny#G^Ftp2e)Z`pulVI=pm!VZqe}l& z7v~kneJLJV1w6quQhpU5{4j9+m4JN7=e_jb@j#VV+)V$^JqTz#`TWsR;F6XquekRT zuD6_ne5fwYD~|h8y!^eu_mJ9dUV&; z-fI^(tZZPocvDX|ub72|`isfj{(+BjiKw}5aQlwpjxC$>{iDOpeY;0@6`H4pxqk4q zZvE6)U;j{{80{(y432bU&K!Rt6AkX}$lQ3D|1alv~GO&&G~KJ8!Lk` z>d5RV7RU10?BwKR^W^I0(eZ(7OM82JHrJYMZEa#k)5PA9V&7EL$ix+8i3N@B!bJc0 z;8<~RbR;Tk_U#(It=N&tWXpqOE2D6FS(_gN>ri2YZ5ikMr!U)i26%sNQ+Ma~srz3! z)wy^k!ptY`Y?!_2{{4p!+;eoY;oq;l@#xvbZ1Cx4UwpOP=+o=!%7@x_mp|)s<O@zKl;g?{4Y6ARNf~}0D6mCIJQ=D-iiMJ2vMb! literal 0 HcmV?d00001 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 );