From 8c599d6529e66c858ea803a6cb4c10838b23fbfc Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 14 Jun 2022 22:07:14 +0800 Subject: [PATCH] =?UTF-8?q?TextureMapView=E6=94=B9=E4=B8=BAAMapNaviView?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B,=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E6=A0=B7=E5=BC=8F:=20.=E9=A9=B6=E8=BF=87=E8=B7=AF?= =?UTF-8?q?=E6=AE=B5=E6=93=A6=E9=99=A4=20.=E9=9A=90=E8=97=8F=E5=AF=BC?= =?UTF-8?q?=E8=88=AA=E7=9B=B8=E5=85=B3UI(=E6=8C=87=E5=8D=97=E9=92=88?= =?UTF-8?q?=E3=80=81=E5=85=A8=E7=A8=8B=E5=AF=BC=E8=88=AA=E5=85=89=E6=9F=B1?= =?UTF-8?q?)=20.=E6=94=BE=E5=BC=80=E9=AB=98=E5=BE=B7=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E6=89=8B=E5=8A=BF=20.=E9=BB=91=E5=A4=9C=E6=A8=A1=E5=BC=8F=20.?= =?UTF-8?q?=E6=96=87=E5=AD=97=E6=A0=87=E6=B3=A8=20=E7=BC=BA=E5=B0=91?= =?UTF-8?q?=E5=AF=BB=E8=BF=B9=E8=B7=AF=E7=BA=BF=E7=BB=8F=E7=BA=AC=E5=BA=A6?= =?UTF-8?q?,=E9=9C=80=E8=A6=81=E6=A0=B9=E6=8D=AE=E5=85=A8=E7=A8=8B?= =?UTF-8?q?=E8=B7=AF=E7=BA=BF=E7=BB=8F=E7=BA=AC=E5=BA=A6=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=85=A8=E8=A7=88=E6=A8=A1=E5=BC=8F=E5=92=8C=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E8=B7=AF=E7=BA=BF=E7=BA=B9=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/core/function/map/MapFragment.java | 1 + .../function/smp/SmallMapDirectionView.java | 46 +++++++++++++++--- .../module_small_map_navi_direction.png | Bin 0 -> 5236 bytes .../module_small_map_view_dir_end.png | Bin 6256 -> 10167 bytes .../module_small_map_view_dir_pass_route.png | Bin 0 -> 159 bytes .../module_small_map_view_dir_start.png | Bin 7707 -> 9811 bytes .../main/res/layout/module_small_map_view.xml | 26 +++++----- .../src/main/res/values-xhdpi/dimens.xml | 4 +- .../src/main/res/values/dimens.xml | 4 +- 9 files changed, 55 insertions(+), 26 deletions(-) create mode 100644 core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_navi_direction.png mode change 100644 => 100755 core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_end.png create mode 100644 core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_pass_route.png mode change 100644 => 100755 core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_start.png diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java index 7f15ca0aaf..a91b156399 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java @@ -11,6 +11,7 @@ import androidx.annotation.Nullable; import com.alibaba.android.arouter.facade.annotation.Route; import com.amap.api.maps.AMap; import com.amap.api.maps.TextureMapView; +import com.amap.api.maps.UiSettings; import com.mogo.commons.mvp.MvpFragment; import com.mogo.eagle.core.data.constants.MoGoFragmentPaths; import com.mogo.eagle.core.data.map.CenterLine; diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java index 5b671fdd3a..ebf1e540cd 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java @@ -3,6 +3,7 @@ package com.mogo.eagle.core.function.smp; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_MAP; import android.content.Context; +import android.graphics.BitmapFactory; import android.graphics.Color; import android.location.Location; import android.os.Bundle; @@ -29,6 +30,9 @@ import com.amap.api.maps.model.Marker; import com.amap.api.maps.model.MarkerOptions; import com.amap.api.maps.model.Polyline; import com.amap.api.maps.model.PolylineOptions; +import com.amap.api.navi.AMapNaviView; +import com.amap.api.navi.AMapNaviViewOptions; +import com.amap.api.navi.model.RouteOverlayOptions; import com.mogo.cloud.commons.utils.CoordinateUtils; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.data.map.MogoLocation; @@ -58,7 +62,7 @@ public class SmallMapDirectionView public static final String TAG = "SmallMapDirectionView"; private RoundLayout rlSmallMapBorder; - private TextureMapView mAMapNaviView; + private AMapNaviView mAMapNaviView; private AMap mAMap; private Marker mCarMarker; private Marker mStartMarker; @@ -112,12 +116,12 @@ public class SmallMapDirectionView private void initAMapView() { mCameraUpdate = CameraUpdateFactory.zoomTo(zoomLevel); mAMap = mAMapNaviView.getMap(); - // 关闭地图文字标注 - mAMap.showMapText(false); + // 地图文字标注 + mAMap.showMapText(true); // 设置导航地图模式，aMap是地图控制器对象。 - mAMap.setMapType(AMap.MAP_TYPE_NIGHT); - // 关闭显示实时路况图层，aMap是地图控制器对象。 - mAMap.setTrafficEnabled(false); + mAMap.setMapType(AMap.MAP_TYPE_NORMAL); + // 显示实时路况图层，aMap是地图控制器对象。 + mAMap.setTrafficEnabled(true); // 设置 锚点 图标 mCarMarker = mAMap.addMarker(new MarkerOptions() .icon(BitmapDescriptorFactory.fromResource(R.drawable.module_small_map_view_my_location_logo)) @@ -131,14 +135,40 @@ public class SmallMapDirectionView .setEnable(true) .setStyleData(MapAssetStyleUtils.getAssetsStyle(getContext())) .setStyleExtraData(MapAssetStyleUtils.getAssetsExtraStyle(getContext())); + + AMapNaviViewOptions options = mAMapNaviView.getViewOptions(); + //打开走过的路段自定义 + options.setAfterRouteAutoGray(true); + //黑夜模式 + options.setNaviNight(true); + //导航全程光柱 + options.setTrafficBarEnabled(false); + //指南针 + options.setCompassEnabled(false); + //自定义样式 + RouteOverlayOptions routeOverlayOptions = new RouteOverlayOptions(); + //自车车标 + options.setCarBitmap(BitmapFactory.decodeResource(this.getResources(), R.drawable.module_small_map_view_my_location_logo)); + options.setFourCornersBitmap(BitmapFactory.decodeResource(this.getResources(), R.drawable.module_small_map_navi_direction)); + options.setStartPointBitmap(BitmapFactory.decodeResource(this.getResources(), R.drawable.module_small_map_view_dir_start)); +// options.setWayPointBitmap(BitmapFactory.decodeResource(this.getResources(), R.drawable.navi_way)); + options.setEndPointBitmap(BitmapFactory.decodeResource(this.getResources(), R.drawable.module_small_map_view_dir_end)); + //驶过路段擦除 + routeOverlayOptions.setPassRoute(BitmapFactory.decodeResource(getResources(), R.drawable.module_small_map_view_dir_pass_route)); + options.setRouteOverlayOptions(routeOverlayOptions); + mAMapNaviView.setViewOptions(options); // 设置自定义样式 mAMap.setCustomMapStyle(customMapStyleOptions); + //设置希望展示的地图缩放级别 mAMap.moveCamera(mCameraUpdate); // 设置地图的样式 UiSettings uiSettings = mAMap.getUiSettings(); uiSettings.setZoomControlsEnabled(false);// 地图缩放级别的交换按钮 - uiSettings.setAllGesturesEnabled(false);// 所有手势 + uiSettings.setAllGesturesEnabled(true);// 所有手势 + uiSettings.setCompassEnabled(false); + //设置倾斜手势是否可用。 + uiSettings.setTiltGesturesEnabled(true); uiSettings.setMyLocationButtonEnabled(false); // 显示默认的定位按钮 uiSettings.setLogoBottomMargin(-150); //设置Logo下边界距离屏幕底部的边距,设置为负值即可 mAMap.setOnMapLoadedListener(() -> { @@ -157,7 +187,7 @@ public class SmallMapDirectionView @Override public boolean onInterceptTouchEvent(MotionEvent ev) { - return true; + return false; } diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_navi_direction.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_navi_direction.png new file mode 100644 index 0000000000000000000000000000000000000000..20411285a75d31d06d12e42d927745d4122aad61 GIT binary patch literal 5236 zcmZ`-XH*l+whf`TpfrUbBE5G>qzF<3gn)uH0YL!;iGXwk=|!Zephycvk&YlBL25z? zy-O&G5K4g1dkgq-*L`>0@5g(y*6i75&pBsio%u1dCho3@J}VP16952UH8jvQql{Vq z>I~ErYXlbbcfM3E8iYZUa zga`0100hiwK=AcMH8l?o4z{M+& z;J-PA)Ya8digxMJB~ejP0RaJTZ*Pj}=;*k=zdtxQ2!%p#-@Z*zC}pHLcXoE7P^kI& zc@l~A^5siYQ&Y;`DD{kph@ga!$>gS{CL9h&N#*6`_2I(@Boav^5|xycii?XW>&C^! zX=rFvR#xih=FEgx3078CQc_Z5V`CG>RrZvHn|;kp z%mEC-iTQpx;T*WJiODONsr@7T;!a8J82Rrcac?ZuTEyC{;iUJw?GRzZjh6cSc$F)1 zhC%SI2y>HCps2?a$9Zex87zUJ{wD&*v-D1pmB}l~TC> z?uS8Fu$F}KgD((M`To?wCCx&&7?%O-U!NW~$E_H7>#i&BBwV;YF+MK$2!FaiF`+a0 zcX#*jcy?-kcmCrP&^Z?^jJ3b39dpotJa;mfLI@RH!*EuVgZv1Z63!}>`pvy`SW%(L$Pk2rQsHaya znTlebEy)#>bZx5rJH7e(>4$n#S$R~J{GV8k>uKH@=$`W|u$UI{V;%&_TNH zZW&td-=Fb)yx_`o$@P0 z{bXt8yq@@XBv#t}^x%qG-D^y%OMZj@HBslFUzO`BR5~}HN+)M*Pn4x#v*Trd`6r%? zm#5SDRu3a5_rC8r_Wt>>o%mjX&cpWG@X`Lvz8kRasZl2zhjA6h*GL_zuBZHXAEE`*IFTCcj zR1YHLij}np)NX+n;SEGQM z+Nwi>w|JP+*^+p~7};1=#v`GqNT#%;)WPs(z@zlSyg%;YF*gj!6DU6Fh>g?XKt6Oj zYs~Y^3ulZYa|g$~;4@gii-inKYGG!a&UCulKWA|B@RS$Nov_x072-K;6QeJWfF7Mta* z6C$Y<*hI4kom^irtP039p$~c>f!;`LrCPxaC@s@{+0G1wpCm==^b2MfGfRoAd44Xyd1?$FaB+AFKPw0 z>lNR;zt}cAhkKfN)j>&pE{zVbfOAVC3@EOZjL-PpcJ&`u=& z%=1>erp=M^NK$kme(uHGJ}tP$dWaOu9Q{LYXu;8>ulw?m0CmEwUI(?1+|U%hi5!kq zw==EP`N@!xtUq7R32Vp9>)E@1KR8OOPyH07CIJm+aN)?W;`@qo4!$5qvh|`+lFGbe-T}V zJ_feKfy#)!0uR2cv6%Qv1wx;AnNerJpG9zOWh=Y*o$d~&70I?lqsQRO9&;1H+A4a= zc8*NJ>WHX{MotId^f}?-omSCQn06cn9p@otG12o4 ziux2^Z|?XOc?$)<*HamLY`srgAT`Bed>xe#**cfT@BmjB1IbO3Y(v_Gt7@` zPZ?q4n;y!!tIS6-^LpmoC?btM5?-1W`o82r7b48 zHRH1IcpbeoI*(REziQFvimJsny``KKjLb$rsN?TraA}`8PU!8TmNY5$-OL#)P@y z$8$3gc;`wlh9=b`6nYSjW?vIdjpkVSnfm5}2}TgJGh&g}9wh~j7s~RxfwqY@iWU|P z^9_G!TDGg}F>ENQirGfTW&aY!3oDdLXQzp;$8&)Y{t?p>Zqiv@)mgsi>}>1|hm`O$ za4@;*)-9w6?KAb2{CMlI+zfTn@myp6t59JlA#1)s=&B-$W-1Q&N$u`Y!>R>gs$(1HJZp~W zuf$O^DA$T3X@K5Y!eScwr~t$w+Hzd;W*pu9iP6Kf?`GXaDNoDkZm##%!kV5{;x8?v zZdN%Q*8x2sH-^f8lvdX?WJL%g+e}#C!rB}7meTg&!gJAUE*8(;Ie6tW*Isu#8 z{(q@{fS1faPce)Asi0OT=ZEZ^pMi;41Yj-VV44tZm;}<$r5MqU@}M}$owy}?32;Jt~kQ1&v?cY zw-XzN?5`_JY}!71H7j8kJjNU^7dqrFJG~n71qBqa4@gG0E$zaVjWQ6gt}|&s_9H?P zc)dYNUdgO67-^jQ@+|Fwak#t4$2K+DYwbktTt2>qLTTdO{;*%#}R zLsaSal)yiZ6ao&<+N^RIL7G2D$#XJJbu0Rwo-H)yaW^!L#Q1$iH!Xwv6fDV_8s1J% zo;-O$UPJrrdf(kUJ4?TZ6nr!Lnd`Cl3x&Ov?u9v;GYRJmhsnkGcD5X)=!Zjl zSABZC4hb;}$0D(JsDx7E3aM@$~ZqOcw1{V{a7yK0d=+PtcIPzS5fV-v)z!!WW>{NI3YQH${Qzi>8 z#Do5XM1Xg}-(E&@f`|d{KAYFTO!4m`KQcP&vnrmpI!`o#`COZ)Q0r0Hay?_wy}Ft2 z4u3Z(ukdsfO3G>=XH%f+qpD6NJs*}VLb-}jYZ@u9V<#1UlB)XnZuowxHj{B_FpX^QZC!K6S+LuxS-4P% zc)%CAj&7afck!ZZ_}Qw3-_L5<^L{YZIcThxB>GCG!&Ej&ZJ^?Bqu^)w;a?tgA|j0L zrQQ{q5BgW!t>hHT#dpn9i$+9TCVf|I*?$_>y~vfesx|K!)uk1WP8;L>HoARz^BS-@ z=CYrTUw?@9!7GPSD+e?qH`?t3jEv8z~D2r$(qY5&0fdVf~KKaPL zk~l&@PL;|Xp?}X@t>!JukO+L=sKPl)=pB-Y@d`_Y=12Cx75JVKb#i?oJDRGM2g zIE^SVqv$S4Ry*U+r(}~?L7Xc>5I@EDlujY0XxT5jzZ_pEC=i_ zzS_R^-ED5ky2Un2P56?(Ry%ry?c;FghogTLlZupf6}yYG5!%{md>(?q#(d zS4#?}j0LyTTp>A)Imw3cUfCJC=7Di%z2|xSjM*&7#tFt_j1tR&B5=e5JbV959ADlS z=PO?akgqeovS&n84IDo*xu zb0JjMD|YkV_Ncl*BDMkt%rD7hX#^cCp}y$LA<#=~V`JoFB~i|Pu||%lElUvBlhvB) z2!vO1_FYt)$)b`~k$@=8FxJ;@C^tQg*2u$rWv#+{x#qg9g-y-^cgAv!K4K`j zsX6Gd!(f>Zt8lhKey=vDxiXkS&H~>{tdITHq+(}NHaf*5OAm%WZe+;bHFX9yzs}Lw z97^dzk>4-v0lhmUto7@`!Eb~Rqab_9J}i1BxP9iWBTDrdU;wi{dBZy8@%gB{Hyipr zx5r&_7_TpNh>+ly$syZ2^O$-u_%$B8 zZt3-XRzyC(c3nQPVpC2==IU0PsxSitg5ugUHW{A(rc{rNud%;*|AFPo5#Ob&AAS-& zGJjh%1~7+#bHJzZA*wGkL$*j)j#AuiHe8n5cvf6^bH3pH&b&uu96Y*bgPp2tU3}UCutWBXBv5GkXydy-AJN{2o5VqX*P~@@V rN?mYOl7fB4WXVhmnFNt3KEFDgvn1CgqL@$l00J25ndnw%J4XBuePf_t literal 0 HcmV?d00001 diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_end.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_end.png old mode 100644 new mode 100755 index f030e6887d87467898fb39eef4aa856a47a8e653..38204c4e09b6ce3fa27940e884b3ae7e7c185f24 GIT binary patch literal 10167 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 LNkvXXu0mjfB)8(Q diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_pass_route.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_pass_route.png new file mode 100644 index 0000000000000000000000000000000000000000..40521d0788b14f479bec9009bedc6d2ff1a92dc7 GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJG*1`DkcwMx&uQ~D7zngH+$(vV zRYm;3XAQnt3L9L-xHBW~&f*gJsV=!W>AA3`NA|Z>W@by?UQ_mYKDD%9-}Lp1n+|TfFE!By8ix!%I3L(^cPYbO+okpKp9(GZ-YqP%0Lgp0`njxgN@xNA13ff~ literal 0 HcmV?d00001 diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_start.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/module_small_map_view_dir_start.png old mode 100644 new mode 100755 index 9a7f520b33f2c49be0a4b4ccda47a99c203e6720..e44f52a3c1b4a841c5fd88fc498b00342daf138e GIT binary patch literal 9811 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 + android:layout_centerInParent="true" /> + android:layout_centerInParent="true"> - - - - + + + + - + + android:src="@drawable/module_small_map_view_border_north" + android:visibility="gone" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-map/src/main/res/values-xhdpi/dimens.xml b/core/function-impl/mogo-core-function-map/src/main/res/values-xhdpi/dimens.xml index 5b648ef397..2d9205f188 100644 --- a/core/function-impl/mogo-core-function-map/src/main/res/values-xhdpi/dimens.xml +++ b/core/function-impl/mogo-core-function-map/src/main/res/values-xhdpi/dimens.xml @@ -12,8 +12,8 @@ 200px 40px - 400px + 700px 550px - 360px + 660px \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-map/src/main/res/values/dimens.xml b/core/function-impl/mogo-core-function-map/src/main/res/values/dimens.xml index a4cebc3ea8..74dc5d134d 100644 --- a/core/function-impl/mogo-core-function-map/src/main/res/values/dimens.xml +++ b/core/function-impl/mogo-core-function-map/src/main/res/values/dimens.xml @@ -12,7 +12,7 @@ 100px 30px - 288px + 488px 450px - 260px + 460px \ No newline at end of file