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

Merge remote-tracking branch 'origin/dev2' into dev2

Browse Source 
# Conflicts:
#	services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
This commit is contained in:
tongchenfei
2021-01-29 11:25:59 +08:00
parent 3bdf068499 61ec921f39
commit a0ee69291b
3 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
View File

@@ -332,6 +332,11 @@ class MogoOCHTaxiModel {
private void judgeStationStation( Location location ) {
OCHTaxiOrderResponse.OCHTaxiStation station = mCurrentOCHOrder.drivingRoutes.get( 0 );//起点
double distance = CoordinateUtils.calculateLineDistance( station.lon, station.lat, location.getLongitude(), location.getLatitude() );
if ( distance > 5 ) {
distance = CoordinateUtils.calculateLineDistance( station.lon, station.lat,
MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLon(),
MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLat() );
}
if ( distance <= 5 ) {
mIsArriveAtStartStation = true;
unregisterCarLocationListener();