diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index 3b773b9652..7e5d18ebef 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -55,7 +55,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - implementation 'com.zhidaoauto.machine:map:1.0.0-online-6' + implementation 'com.zhidaoauto.machine:map:1.0.0-online-7' } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() 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 7e2744d2a3..cf91e3a699 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 @@ -648,7 +648,7 @@ public class AMapViewWrapper implements IMogoMapView, IMogoMapUIController, Loca } @Override - public void onLocationChanged(@NotNull com.zhidaoauto.map.sdk.open.location.Location location) { + public void onLocationChanged(@NotNull com.zhidaoauto.map.sdk.open.location.MogoLocation location) { Location sysLocation = new Location(location.getProvider()); sysLocation.setAltitude(location.getAltitude()); sysLocation.setLatitude(location.getLat()); diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/location/ALocationClient.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/location/ALocationClient.java index 4c3de2ec8c..c36becd865 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/location/ALocationClient.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/location/ALocationClient.java @@ -8,7 +8,6 @@ import com.mogo.map.location.IMogoLocationClient; import com.mogo.map.location.IMogoLocationListener; import com.mogo.map.location.MogoLocation; import com.mogo.utils.logger.Logger; -import com.zhidaoauto.map.sdk.open.location.Location; import com.zhidaoauto.map.sdk.open.location.LocationClient; import com.zhidaoauto.map.sdk.open.location.LocationListener; @@ -37,7 +36,7 @@ public class ALocationClient implements IMogoLocationClient { public ALocationClient( Context context ) { mClient = new LocationClient( context ); mClient.registerListener( mListener ); - mLastLocation = ObjectUtils.fromLocation( mClient.getLastKnownLocation() ); + mLastLocation = ObjectUtils.fromLocation( mClient.getLastKnownMogoLocation() ); if ( mLastLocation == null ) { mLastLocation = new MogoLocation(); } @@ -131,7 +130,7 @@ public class ALocationClient implements IMogoLocationClient { private class InternalLocationListener implements LocationListener { @Override - public void onLocationChanged(@NotNull Location location) { + public void onLocationChanged(@NotNull com.zhidaoauto.map.sdk.open.location.MogoLocation location) { if ( mIsDestroyed ) { destroyWarming(); return; 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 a8b2b34e94..b8f9f9b1ac 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 @@ -28,7 +28,6 @@ import com.mogo.map.search.poisearch.MogoSearchBound; import com.mogo.map.search.poisearch.query.MogoPoiSearchQuery; import com.mogo.map.uicontroller.MapCameraPosition; import com.zhidaoauto.map.sdk.open.camera.CameraPosition; -import com.zhidaoauto.map.sdk.open.location.Location; import com.zhidaoauto.map.sdk.open.marker.BitmapDescriptor; import com.zhidaoauto.map.sdk.open.marker.BitmapDescriptorFactory; import com.zhidaoauto.map.sdk.open.marker.MarkerOptions; @@ -118,7 +117,7 @@ public class ObjectUtils { } - public static MogoLocation fromLocation( Location aLocation ) { + public static MogoLocation fromLocation( com.zhidaoauto.map.sdk.open.location.MogoLocation aLocation ) { if ( aLocation == null ) { return null; }