yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_custom_map' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev_custom_map

Browse Source
This commit is contained in:
wangcongtao
2020-07-03 09:45:56 +08:00
parent e02eb0c437 04c9f5c71f
commit f42ba8f7d4
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
View File

@@ -65,9 +65,9 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca
private EnumMapUI mCurrentUIMode;
private boolean mIsCarLocked = false;
private int mLockZoom = 14;
private int mLockZoom = 16;
private float mDefaultZoomLevel = 14.0f;
private float mDefaultZoomLevel = 16.0f;
private final CarCursorOption DEFAULT_OPTION = new CarCursorOption.Builder()
.carCursorRes(R.drawable.map_api_ic_current_location2)
.naviCursorRes(R.drawable.ic_amap_navi_cursor)
@@ -248,24 +248,24 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca
mDefaultZoomLevel = (int) (getMap().getZoomLevel() + 0.5f);
if (zoom) {
if (mDefaultZoomLevel >= 7) {
if (mDefaultZoomLevel >= 20) {
return MapControlResult.TARGET;
}
} else {
if (mDefaultZoomLevel <= 0) {
if (mDefaultZoomLevel <= 7) {
return MapControlResult.TARGET;
}
}
if (zoom) {
mDefaultZoomLevel += 1f;
if (mDefaultZoomLevel > 7) {
mDefaultZoomLevel = 7;
if (mDefaultZoomLevel > 19) {
mDefaultZoomLevel = 19;
}
} else {
mDefaultZoomLevel -= 1f;
if (mDefaultZoomLevel < 0) {
mDefaultZoomLevel = 0;
if (mDefaultZoomLevel < 8) {
mDefaultZoomLevel = 8;
}
}
changeZoom(mDefaultZoomLevel);
@@ -560,7 +560,7 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca
if ( !lockCarPosition ) {
loseLockMode();
}
mMapView.getMapAutoViewHelper().setLocation(ObjectUtils.fromMogo(carPosition));
mMapView.getMapAutoViewHelper().setCenter(ObjectUtils.fromMogo(carPosition));
mMapView.getMapAutoViewHelper().moveCamera( CameraUpdateFactory.INSTANCE.newLatLngBounds( latLngBounds, bound.left, bound.right, bound.top, bound.bottom ) );
} catch (Exception e) {
Logger.e(TAG, e, "%s error.", tag);