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-06-18 14:29:22 +08:00
parent 9cfada844c 6778425b41
commit 8500cd4391
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/map-custom/build.gradle
View File

@@ -50,7 +50,7 @@ dependencies {
implementation project(':foudations:mogo-commons')
}
api 'com.zhidaoauto.machine:map:1.0.0-SNAPSHOT-60'
api 'com.zhidaoauto.machine:map:1.0.0-SNAPSHOT-61'
}
apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()

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

@@ -31,6 +31,7 @@ import com.zhidaoauto.map.sdk.open.MapParams;
import com.zhidaoauto.map.sdk.open.abs.OnMapClickListener;
import com.zhidaoauto.map.sdk.open.abs.OnMapLoadedListener;
import com.zhidaoauto.map.sdk.open.abs.OnMapTouchListener;
import com.zhidaoauto.map.sdk.open.camera.CameraPosition;
import com.zhidaoauto.map.sdk.open.location.LocationListener;
import com.zhidaoauto.map.sdk.open.location.MyLocationStyle;
import com.zhidaoauto.map.sdk.open.marker.BitmapDescriptorFactory;
@@ -342,16 +343,18 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca
private void setUIMode(EnumMapUI ui) {
this.mCurrentUIMode = ui;
switch (ui) {
case CarUp_2D:
mMapView.getMapAutoViewHelper().setMapViewPerspective(MapParams.MAP_PERSPECTIVE_2D);
break;
case CarUp_3D:
mMapView.getMapAutoViewHelper().setMapViewPerspective(MapParams.MAP_PERSPECTIVE_3D);
break;
case NorthUP_2D:
mMapView.getMapAutoViewHelper().setRotateGesturesEnabled(false);
break;
if( mMapView.getMapAutoViewHelper() != null){
switch (ui) {
case CarUp_2D:
mMapView.getMapAutoViewHelper().setMapViewPerspective(MapParams.MAP_PERSPECTIVE_2D);
break;
case CarUp_3D:
mMapView.getMapAutoViewHelper().setMapViewPerspective(MapParams.MAP_PERSPECTIVE_3D);
break;
case NorthUP_2D:
mMapView.getMapAutoViewHelper().setRotateGesturesEnabled(false);
break;
}
}
}
@@ -575,7 +578,7 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca
public void setRenderFps(int fps) {
if (checkAMapView()) {
if (mMapView.getMapAutoViewHelper() != null) {
// mMapView.getMapAutoViewHelper().setRenderFps( fps );
mMapView.getMapAutoViewHelper().setRenderFps( fps );
Logger.d(TAG, "设置刷新帧率 fps = %s", fps);
}
}
@@ -674,8 +677,8 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca
@Override
public MapCameraPosition getMapCameraPosition() {
if (checkAMapView()) {
// CameraPosition cameraPosition = mMapView.getMap().getCameraPosition();
// return ObjectUtils.fromAMap( cameraPosition );
CameraPosition cameraPosition = mMapView.getMapAutoViewHelper().getCameraPosition();
return ObjectUtils.fromAMap( cameraPosition );
}
return null;
}
@@ -725,8 +728,8 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca
}
@Override
public void onMarkClick(@NotNull MarkerInfo markerInfo) {
public void onMarkClick(@NotNull Marker markerInfo) {
mMarkerClickHandler.handleMarkerClicked( markerInfo );
}
@Override

2
libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java
View File

@@ -259,7 +259,7 @@ public class AMapMarkerWrapper implements IMogoMarker, Observer {
if(mMarker != null){
mMarker.setOnMarkClickListener(new Marker.OnMarkClickListener() {
@Override
public void onMarkClick(@NotNull MarkerInfo markerInfo) {
public void onMarkClick(@NotNull Marker marker) {
mMogoMarkerClickListener.onMarkerClicked(AMapMarkerWrapper.this);
}
});