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-30 16:24:06 +08:00
parent 2927fe2a4c c849a87324
commit e5a15d1d0d
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -248,27 +248,27 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca
@Override
public MapControlResult changeZoom(boolean zoom) {
if (checkAMapView()) {
mDefaultZoomLevel = (int) (getMap().getZoomLevel() + 0.5f);
mDefaultZoomLevel = (getMap().getZoomLevel() + 0.5f);
if (zoom) {
if (mDefaultZoomLevel >= 20) {
if (mDefaultZoomLevel >= 20f) {
return MapControlResult.TARGET;
}
} else {
if (mDefaultZoomLevel <= 7) {
if (mDefaultZoomLevel <= 7f) {
return MapControlResult.TARGET;
}
}
if (zoom) {
mDefaultZoomLevel += 1f;
if (mDefaultZoomLevel > 19) {
mDefaultZoomLevel = 19;
if (mDefaultZoomLevel > 19f) {
mDefaultZoomLevel = 19f;
}
} else {
mDefaultZoomLevel -= 1f;
if (mDefaultZoomLevel < 8) {
mDefaultZoomLevel = 8;
if (mDefaultZoomLevel < 8f) {
mDefaultZoomLevel = 8f;
}
}
changeZoom(mDefaultZoomLevel);

3
libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java
View File

@@ -227,6 +227,7 @@ public class AMapWrapper implements IMogoMap {
@Override
public void changeZoom(float zoom) {
Logger.d(TAG, "changeZoom %s", zoom);
if (checkAMap()) {
mAMap.setZoom((int) zoom);
}
@@ -236,7 +237,7 @@ public class AMapWrapper implements IMogoMap {
public float getZoomLevel() {
if (checkAMap()) {
try {
return mAMap.getZoom()*2;
return mAMap.getZoom();
} catch (Exception e) {
}