diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index 6537b666f1..3278b1c35b 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -67,7 +67,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.2.9' + implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.3.0' // implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4' } diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java index 160edc19e2..d20449999b 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java @@ -594,7 +594,7 @@ public class AMapMarkerWrapper implements IMogoMarker, Observer { @Override public void addDynamicAnchorPosition( MogoLatLng latLng, long duration ) { try { - mMarker.addDynamicAnchorPostion( new LonLatPoint( latLng.lon, latLng.lat ), ( int ) duration ); + mMarker.addDynamicAnchorPostion( new LonLatPoint( latLng.lon, latLng.lat ),System.currentTimeMillis(), ( int ) duration ); } catch ( Exception e ) { e.printStackTrace(); } diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/PointInterpolatorUtil.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/PointInterpolatorUtil.java index 6fbb15abc8..cef03ebb2c 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/PointInterpolatorUtil.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/PointInterpolatorUtil.java @@ -56,11 +56,11 @@ public class PointInterpolatorUtil { } public static double[] mergeToRoad( double lon, double lat, List< LonLatPoint > road ) { - closeStart = 0; - closeEnd = road.size() - 1; - getCloseTwoPoint( lon, lat, road ); - LonLatPoint start = road.get( closeStart ); - LonLatPoint end = road.get( closeEnd ); + int closeStart = 0; + int closeEnd = road.size() - 1; + int[] result = getCloseTwoPoint(closeStart,closeEnd, lon, lat, road ); + LonLatPoint start = road.get( result[0] ); + LonLatPoint end = road.get( result[1] ); // Logger.d( TAG, "mergeToRoad start: " + closeStart + " end: " + closeEnd ); // return getMid(start, end); // double[] foot = getFoot( lon, lat, start, end ); @@ -72,12 +72,9 @@ public class PointInterpolatorUtil { return getFootAndMinDistance(lon, lat, start.getLongitude(), start.getLatitude(), end.getLongitude(), end.getLatitude()); } - private static int closeStart = 0; - private static int closeEnd = 0; - - private static void getCloseTwoPoint( double lon, double lat, List< LonLatPoint > road ) { + private static int[] getCloseTwoPoint(int closeStart,int closeEnd, double lon, double lat, List< LonLatPoint > road ) { if ( closeEnd - closeStart == 1 ) { - return; + return new int[]{closeStart,closeEnd}; } LonLatPoint start = road.get( closeStart ); LonLatPoint end = road.get( closeEnd ); @@ -88,7 +85,7 @@ public class PointInterpolatorUtil { } else { closeEnd -= ( closeEnd - closeStart ) / 2; } - getCloseTwoPoint( lon, lat, road ); + return getCloseTwoPoint(closeStart,closeEnd, lon, lat, road ); } private static double[] getFoot( double lon, double lat, LonLatPoint beginPt, LonLatPoint endPt ) { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java index 8b22c98493..32f0d921c1 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java @@ -560,9 +560,9 @@ public class MockIntentHandler implements IntentHandler { break; case 47: mLocationMockHandler.sendEmptyMessageDelayed( 1, 200L ); - mLocationMockHandler.sendEmptyMessageDelayed( 2, 0 ); -// mLocationMockHandler.sendEmptyMessageDelayed( 21, 200 ); -// mLocationMockHandler.sendEmptyMessageDelayed( 3, 0L ); +// mLocationMockHandler.sendEmptyMessageDelayed( 2, 0 ); +// mLocationMockHandler.sendEmptyMessageDelayed( 21, 200 );adb sh + mLocationMockHandler.sendEmptyMessageDelayed( 3, 0L ); // mLocationMockHandler.sendEmptyMessageDelayed( 5, 0L ); break; case 48: