From ea7c13c8838f079cff334bd2b5abff4960831a83 Mon Sep 17 00:00:00 2001 From: jiaguofeng Date: Mon, 3 Aug 2020 16:09:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 8 +++++- .../amap/overlay/RouteOverLayWrapper.java | 2 +- libraries/map-custom/build.gradle | 2 +- .../mogo/map/impl/custom/AMapBaseMapView.java | 3 ++- .../mogo/map/impl/custom/AMapViewWrapper.java | 7 +++--- .../com/mogo/map/impl/custom/AMapWrapper.java | 2 +- .../map/impl/custom/utils/ObjectUtils.java | 22 ++++++++++------ .../mogo/map/marker/MogoMarkerOptions.java | 25 +++++++++++++++++++ 8 files changed, 55 insertions(+), 16 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 2db9aab721..126251d4d6 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,13 @@ - + + + diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/overlay/RouteOverLayWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/overlay/RouteOverLayWrapper.java index c5a6857603..6d645e1b53 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/overlay/RouteOverLayWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/overlay/RouteOverLayWrapper.java @@ -39,7 +39,7 @@ public class RouteOverLayWrapper { private boolean mIsTrafficLightsVisible = true; private int mStartBitmapResId = 0; private int mEndBitmapResId = 0; - private int mZIndex = 0; + private int mZIndex = 1; private static RouteOverlayOptions sOptions; diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index edcd8863f0..16238e297d 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -55,7 +55,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - api 'com.zhidaoauto.machine:map:1.0.0-SNAPSHOT' + implementation 'com.zhidaoauto.machine:map:1.0.0-j4' } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapBaseMapView.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapBaseMapView.java index 94bdad7bab..41396c0a10 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapBaseMapView.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapBaseMapView.java @@ -23,9 +23,10 @@ public class AMapBaseMapView implements IMogoMapViewCreator { @Override public IMogoMapView create( Context context ) { - MapAutoApi.INSTANCE.init( MapParams.Companion.init().setDebugMode( false ) + MapAutoApi.INSTANCE.init( MapParams.Companion.init().setDebugMode( true ) .setCoordinateType( MapParams.COORDINATETYPE_GCJ02 ) .setPerspectiveMode( MapParams.MAP_PERSPECTIVE_2D ) + .setStyleDir("/sdcard/shmdata/style" ) .setZoom( 16 ) .setPointToCenter(0.5f,0.5f) .setStyleMode( MapParams.MAP_STYLE_NIGHT ) ); 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 a96617cd9a..c3af9a70e9 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 @@ -556,6 +556,7 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca if (!checkAMapView()) { return; } + Logger.i(TAG, "showBounds:%s -%s-%s- %b ", tag,carPosition.toString(),bound.toShortString(),lockCarPosition); try { if ( DebugConfig.isDebug() ) { Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); @@ -708,17 +709,17 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca @Override public void onMapStatusChanged(int type, int value) { - Log.i(TAG, "mapop--onMapStatusChanged: "+type+","+value); + Log.i(TAG, "mapop--onMapStatusChanged-: "+type+","+value); } @Override public void onCameraChange(int type, int value) { - Log.i(TAG, "mapop--onCameraChange: "+type+","+value); + Log.i(TAG, "mapop--onCameraChange-: "+type+","+value); } @Override public void onCameraChangeFinish(@Nullable CameraPosition cameraPosition) { - Log.i(TAG, "mapop--onCameraChangeFinish: "+cameraPosition); + Log.i(TAG, "mapop--onCameraChangeFinish-: "+cameraPosition); if ( cameraPosition != null ) { Trace.beginSection( "timer.onCameraChangeFinish" ); MogoMapListenerHandler.getInstance().onMapChanged(ObjectUtils.fromAMap( cameraPosition.getTarget() ), diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java index 8ee3e0c76d..b30ea44036 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java @@ -82,7 +82,7 @@ public class AMapWrapper implements IMogoMap { @Override public IMogoMarker addMarker(String tag, MogoMarkerOptions options) { - Log.i(TAG, "autoop-addMarker: " + tag + ",options:" + options + ",AMap:" + (mAMap != null)+",this:"+this); + Log.i(TAG, "autoop-addMarker: " + tag + ",MogoMarkerOptions:" + options + ",AMap:" + (mAMap != null)+",this:"+this); if (!checkAMap()) { return null; } diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java index 4199d42765..bdeffa0817 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java @@ -2,6 +2,7 @@ package com.mogo.map.impl.custom.utils; import android.content.Context; import android.graphics.Bitmap; +import android.text.TextUtils; import android.view.View; import com.autonavi.nge.guidance.NaviInfo; @@ -77,23 +78,28 @@ public class ObjectUtils { } BitmapDescriptor descriptor = getBitmapDescriptorFromMogo( opt ); - return new MarkerOptions() + MarkerOptions markerOptions = new MarkerOptions() .position( new LonLatPoint(opt.getLongitude(), opt.getLatitude() ) ) -// .title( opt.getTitle() ) -// .snippet( opt.getSnippet() ) .markerIcon(descriptor ) .anchor( opt.getU(), opt.getV() ) // .icons( descriptors ) // .period( opt.getPeriod() ) .rotateAngle( opt.getRotate() ) -// .setFlat( opt.isFlat() ) + .setFlat( opt.isFlat() ) .visible( opt.isVisible() ) .infoWindowEnable( opt.isInifoWindowEnable() ) - .alpha( opt.getAlpha() ); -// .setGps( opt.isGps() ) + .alpha( opt.getAlpha() ) + .setGps( opt.isGps() ) // .draggable( opt.isDraggable() ) -// .setInfoWindowOffset( opt.getOffsetX(), opt.getOffsetY() ) -// .zIndex( opt.getzIndex() ); + .setInfoWindowOffset( opt.getOffsetX(), opt.getOffsetY() ) + .zIndex( opt.getzIndex() ); + if(!TextUtils.isEmpty(opt.getTitle())){ + markerOptions.title(opt.getTitle()); + } + if(!TextUtils.isEmpty(opt.getSnippet())){ + markerOptions.snippet(opt.getSnippet()); + } + return markerOptions; } private static BitmapDescriptor getBitmapDescriptorFromMogo( MogoMarkerOptions options ) { diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkerOptions.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkerOptions.java index f817138f3c..73c06971ca 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkerOptions.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkerOptions.java @@ -308,4 +308,29 @@ public class MogoMarkerOptions extends Observable { this.mAutoManager = autoManager; return this; } + + @Override + public String toString() { + return "MogoMarkerOptions{" + + "latitude=" + latitude + + ", longitude=" + longitude + + ", title='" + title + '\'' + + ", snippet='" + snippet + '\'' + + ", icon=" + icon + + ", icons=" + icons + + ", period=" + period + + ", rotate=" + rotate + + ", flat=" + flat + + ", visible=" + visible + + ", inifoWindowEnable=" + inifoWindowEnable + + ", alpha=" + alpha + + ", isGps=" + isGps + + ", u=" + u + + ", v=" + v + + ", draggable=" + draggable + + ", offsetX=" + offsetX + + ", offsetY=" + offsetY + + ", zIndex=" + zIndex + + '}'; + } }