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

代码优化

Browse Source
This commit is contained in:
wangcongtao
2021-03-03 10:07:02 +08:00
parent 7ca355f885
commit b37ee31e65
8 changed files with 25 additions and 14 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

@@ -53,6 +53,7 @@ import com.zhidaoauto.map.sdk.open.location.MyLocationStyle;
import com.zhidaoauto.map.sdk.open.location.RTKAutopilotLocationBean;
import com.zhidaoauto.map.sdk.open.marker.BitmapDescriptorFactory;
import com.zhidaoauto.map.sdk.open.marker.Marker;
import com.zhidaoauto.map.sdk.open.marker.MarkerOptions;
import com.zhidaoauto.map.sdk.open.marker.OnInfoWindowClickListener;
import com.zhidaoauto.map.sdk.open.marker.OnMarkClickListener;
import com.zhidaoauto.map.sdk.open.query.LonLatPoint;
@@ -1020,13 +1021,22 @@ public class AMapViewWrapper implements IMogoMapView,
}
@Override
public double[] matchRoad( double lon, double lat, double angle, boolean isRTK ) {
SinglePointRoadInfo singlePointRoadInfo = MapDataApi.INSTANCE.getSinglePointMatchRoad( ( ( float ) lon ), ( ( float ) lat ), ( ( float ) angle ), !isRTK, isRTK );
public double[] matchRoad( double lon, double lat, double angle, boolean isGpsLocation, boolean isRTK ) {
SinglePointRoadInfo singlePointRoadInfo = MapDataApi.INSTANCE.getSinglePointMatchRoad( ( ( float ) lon ), ( ( float ) lat ), ( ( float ) angle ), isGpsLocation, isRTK );
if ( singlePointRoadInfo != null
&& singlePointRoadInfo.getCoords() != null
&& !singlePointRoadInfo.getCoords().isEmpty() ) {
double matchedPoint[] = PointInterpolatorUtil.mergeToRoad(lon, lat, singlePointRoadInfo.getCoords());
return CoordinateUtils.transformWgsToGcj( matchedPoint[1], matchedPoint[0] );
double matchedPoint[] = PointInterpolatorUtil.mergeToRoad( lon, lat, singlePointRoadInfo.getCoords() );
// return CoordinateUtils.transformWgsToGcj( matchedPoint[1], matchedPoint[0] );
matchedPoint = CoordinateUtils.transformWgsToGcj( matchedPoint[1], matchedPoint[0] );
MarkerOptions options
= new MarkerOptions( );
options.markerIcon( R.drawable.marker_blue )
.position( new LonLatPoint( matchedPoint[0],matchedPoint[1] ) )
.setGps( false );
mMapView.getMapAutoViewHelper().addMarker( options );
return matchedPoint;
}
return null;
}

4
libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java
View File

@@ -315,9 +315,9 @@ public class AMapUIController implements IMogoMapUIController {
}
@Override
public double[] matchRoad( double lon, double lat, double angle, boolean isRTK ) {
public double[] matchRoad( double lon, double lat, double angle, boolean isGpsLocation, boolean isRTK ) {
if ( mClient != null ) {
return mClient.matchRoad( lon, lat, angle, isRTK );
return mClient.matchRoad( lon, lat, angle, isGpsLocation, isRTK );
}
return null;
}

3
libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
View File

@@ -281,10 +281,11 @@ public interface IMogoMapUIController {
* @param lon
* @param lat
* @param angle
* @param isGpsLocation 是否是 gps 坐标
* @param isRTK
* @return
*/
default double[] matchRoad( double lon, double lat, double angle, boolean isRTK ) {
default double[] matchRoad( double lon, double lat, double angle, boolean isGpsLocation, boolean isRTK ) {
return null;
}
}

4
libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java
View File

@@ -355,10 +355,10 @@ public class MogoMapUIController implements IMogoMapUIController {
}
@Override
public double[] matchRoad( double lon, double lat, double angle, boolean isRTK ) {
public double[] matchRoad( double lon, double lat, double angle, boolean isGpsLocation, boolean isRTK ) {
initDelegate();
if ( mDelegate != null ) {
return mDelegate.matchRoad( lon, lat, angle, isRTK );
return mDelegate.matchRoad( lon, lat, angle, isGpsLocation, isRTK );
}
return null;
}

4
modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java
View File

@@ -190,11 +190,11 @@ class BaseDrawer {
* @return
*/
protected double[] matchRoad( double lon, double lat, double angle, boolean isRtk ) {
double amap[] = CoordinateUtils.transformGcj02toWgs84( lat, lon );
double wgs[] = CoordinateUtils.transformGcj02toWgs84( lat, lon );
return MogoApisHandler.getInstance()
.getApis()
.getMapServiceApi()
.getMapUIController()
.matchRoad( amap[0], amap[1], angle, isRtk );
.matchRoad( wgs[0], wgs[1], angle, true, isRtk );
}
}

2
modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java
View File

@@ -33,7 +33,7 @@ import java.util.concurrent.ConcurrentHashMap;
/**
* @author congtaowang
* @since 2020/10/28
*
* <p>
* 云端数据绘制
*/
public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClickListener, IMogoStatusChangedListener {

2
modules/mogo-module-service/src/main/assets/snapshot.txt
View File

File diff suppressed because one or more lines are too long

2
modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
View File

@@ -558,7 +558,7 @@ public class MockIntentHandler implements IntentHandler {
case 47:
mLocationMockHandler.sendEmptyMessageDelayed( 1, 100L );
mLocationMockHandler.sendEmptyMessageDelayed( 2, 200L );
mLocationMockHandler.sendEmptyMessageDelayed( 3, 100L );
// mLocationMockHandler.sendEmptyMessageDelayed( 3, 100L );
break;
}
}