From a7107b2bea76da4eac2440559dffd4f64acac3db Mon Sep 17 00:00:00 2001 From: jiaguofeng Date: Fri, 19 Jun 2020 11:47:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=81=E8=BD=A6=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BB=A5=E5=8F=8Amarker=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libraries/map-custom/build.gradle | 2 +- .../mogo/map/impl/custom/AMapBaseMapView.java | 2 +- .../mogo/map/impl/custom/AMapViewWrapper.java | 18 ++---------------- .../com/mogo/map/impl/custom/AMapWrapper.java | 6 +++--- .../map/impl/custom/utils/ObjectUtils.java | 4 ++-- .../poisearch/query/MogoPoiSearchQuery.java | 2 +- 6 files changed, 10 insertions(+), 24 deletions(-) diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index 26cde464b8..ff6dadce58 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -50,7 +50,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - api 'com.zhidaoauto.machine:map:1.0.0-SNAPSHOT-61' + api 'com.zhidaoauto.machine:map:1.0.0-SNAPSHOT' } 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 42bb94f50e..87c62cb562 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,7 +23,7 @@ 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 ) .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 2ea5d0ef42..9ae47cfe5a 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 @@ -435,8 +435,7 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca // Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); // } Logger.d(TAG, "锁车"); -// mMapView.recoverLockMode(); - mMapView.getMapAutoViewHelper().setRotateGesturesEnabled(false); + mMapView.getMapAutoViewHelper().setLockMode(true); mIsCarLocked = true; } } @@ -447,8 +446,7 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca Logger.d(TAG, Log.getStackTraceString(new Throwable())); } Logger.d(TAG, "解锁锁车"); -// mockTouchEvent(); - mMapView.getMapAutoViewHelper().setRotateGesturesEnabled(true); + mMapView.getMapAutoViewHelper().setLockMode(false); mIsCarLocked = false; } @@ -462,18 +460,6 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca } - /** - * 模拟点击事件，达到锁车->普通事件 - */ - private void mockTouchEvent() { - long downTime = SystemClock.uptimeMillis(); - long eventTime = downTime + 1; - int metaState = 0; - MotionEvent motionEvent = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_DOWN, 0, 0, metaState); - mMapView.dispatchTouchEvent(motionEvent); - MotionEvent upEvent = MotionEvent.obtain(downTime + 1, eventTime + 2, MotionEvent.ACTION_UP, 0, 0, metaState); - mMapView.dispatchTouchEvent(upEvent); - } @Override 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 37e886fd47..78761ccbaa 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 @@ -164,7 +164,7 @@ public class AMapWrapper implements IMogoMap { @Override public void setPointToCenter(int x, int y) { if (checkAMap()) { -// mAMap.setPointToCenter(x, y); + mAMap.setPointToCenter(x, y); } } @@ -172,14 +172,14 @@ public class AMapWrapper implements IMogoMap { public void setTouchPoiEnable(boolean touchPoiEnable) { if (checkAMap()) { // TODO: 2020/5/27 jia 设置 -// mAMap.setTouchPoiEnable( touchPoiEnable ); + mAMap.setTouchPoiEnable( touchPoiEnable ); } } @Override public void setTrafficEnable(boolean enable) { if (checkAMap()) { - mAMap.setTrafficEnabled( enable ); + mAMap.setTraffic( enable ); } } 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 c6764dcba3..4199d42765 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 @@ -75,13 +75,13 @@ public class ObjectUtils { descriptors.add( new BitmapDescriptor(icon) ); } } -// BitmapDescriptor descriptor = getBitmapDescriptorFromMogo( opt ); + BitmapDescriptor descriptor = getBitmapDescriptorFromMogo( opt ); return new MarkerOptions() .position( new LonLatPoint(opt.getLongitude(), opt.getLatitude() ) ) // .title( opt.getTitle() ) // .snippet( opt.getSnippet() ) - .markerIcon( opt.getIcon() ) + .markerIcon(descriptor ) .anchor( opt.getU(), opt.getV() ) // .icons( descriptors ) // .period( opt.getPeriod() ) diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/poisearch/query/MogoPoiSearchQuery.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/poisearch/query/MogoPoiSearchQuery.java index b3b539fca3..76f8ed09d6 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/poisearch/query/MogoPoiSearchQuery.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/poisearch/query/MogoPoiSearchQuery.java @@ -13,7 +13,7 @@ import com.mogo.map.MogoLatLng; */ public class MogoPoiSearchQuery implements Parcelable { - private String query; + private String query = ""; private String category; private String city; private String building;