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 82c26673cd..58a6e726ad 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 @@ -60,8 +60,9 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca private EnumMapUI mCurrentUIMode; private boolean mIsCarLocked = false; + private int mLockZoom = 14; - private float mDefaultZoomLevel = 7.0f; + private float mDefaultZoomLevel = 14.0f; private final CarCursorOption DEFAULT_OPTION = new CarCursorOption.Builder() .carCursorRes(R.drawable.map_api_ic_current_location2) .naviCursorRes(R.drawable.ic_amap_navi_cursor) @@ -229,52 +230,17 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca } - - /** - * 地图marker点击 - */ -// @Override -// public boolean onMarkerClick( Marker marker ) { -// return mMarkerClickHandler.handleMarkerClicked( marker ); -// } -// -// /** -// * POI 点击 -// */ -// @Override -// public void onPOIClick( Poi poi ) { -// if ( InterceptorHandler.getInstance().ignorePoiClicked( getContext() ) ) { -// return; -// } -// MogoMapListenerHandler.getInstance().onPOIClick( ObjectUtils.fromAMap( poi ) ); -// } -// -// @Override -// public void onMapClick( LatLng latLng ) { -// if ( InterceptorHandler.getInstance().ignoreMapClicked( getContext() ) ) { -// return; -// } -// MogoMapListenerHandler.getInstance().onMapClick( ObjectUtils.fromAMap( latLng ) ); -// } -// -// @Override -// public void onPolylineClick( Polyline polyline ) { -// if ( !NaviClient.getInstance( getContext() ).isNaviing() ) { -// NaviClient.getInstance( getContext() ).handleClickedPolyline( polyline ); -// } -// } -// @Override public void setTrafficEnabled(boolean visible) { if (checkAMapView()) { -// mMapView.setTrafficLine( visible ); + mMapView.getMapAutoViewHelper().setTraffic(visible); } } @Override public MapControlResult changeZoom(boolean zoom) { if (checkAMapView()) { - mDefaultZoomLevel = (int) (getMap().getZoomLevel() + 0.5f)/2; + mDefaultZoomLevel = (int) (getMap().getZoomLevel() + 0.5f); if (zoom) { if (mDefaultZoomLevel >= 7) { @@ -297,7 +263,7 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca mDefaultZoomLevel = 0; } } - changeZoom((int) mDefaultZoomLevel); + changeZoom(mDefaultZoomLevel); } return MapControlResult.SUCCESS; } @@ -440,7 +406,8 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca // Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); // } Log.d(TAG, "锁车"); - mMapView.getMapAutoViewHelper().setLockMode(false); + mMapView.getMapAutoViewHelper().setZoom(mLockZoom/2); + mMapView.getMapAutoViewHelper().setLockMode(true); mIsCarLocked = true; } } @@ -457,7 +424,7 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca @Override public void setLockZoom(int var1) { - + mLockZoom = var1; } @Override @@ -479,7 +446,7 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca @Override public MogoLatLng getCameraNorthEastPosition() { - return null; + return ObjectUtils.fromAMap( MapTools.INSTANCE.getVisibleRegion().getRightTopPoint()); } 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 a8c5ddaf58..b91b99fe09 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 @@ -223,7 +223,7 @@ public class AMapWrapper implements IMogoMap { @Override public void changeZoom(float zoom) { if (checkAMap()) { - mAMap.setZoom((int) zoom); + mAMap.setZoom((int) zoom/2); } } diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java index 96a612153c..a98ac0e07f 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java @@ -175,7 +175,7 @@ public class AMapUIController implements IMogoMapUIController { @Override public void setPointToCenter(double mapCenterX, double mapCenterY) { if (mClient != null) { -// mClient.setPointToCenter(mapCenterX, mapCenterY); + mClient.setPointToCenter(mapCenterX, mapCenterY); } }