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

Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0

Browse Source 
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperOrderModel.java
#	app/src/main/AndroidManifest.xml
This commit is contained in:
yangyakun
2023-02-02 21:01:24 +08:00
parent 15df79ff01 d032e77f6e
commit 49397cdc8b
123 changed files with 1161 additions and 931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/locationinfo/MogoLocationSource.java
View File

@@ -9,7 +9,7 @@ public class MogoLocationSource extends LocationServiceProvider {
@Override
public float getBearing() {
if (MogoLocationInfoServices.getInstance().getLocation() != null) {
return MogoLocationInfoServices.getInstance().getLocation().getBearing();
return (float) MogoLocationInfoServices.getInstance().getLocation().getHeading();
}
return 0;
}
@@ -33,7 +33,7 @@ public class MogoLocationSource extends LocationServiceProvider {
@Override
public float getSpeed() {
if (MogoLocationInfoServices.getInstance().getLocation() != null) {
return MogoLocationInfoServices.getInstance().getLocation().getSpeed();
return MogoLocationInfoServices.getInstance().getLocation().getGnssSpeed();
}
return 0;
}
@@ -81,7 +81,7 @@ public class MogoLocationSource extends LocationServiceProvider {
@Override
public long getTime() {
if (MogoLocationInfoServices.getInstance().getLocation() != null) {
return MogoLocationInfoServices.getInstance().getLocation().getTime();
return MogoLocationInfoServices.getInstance().getLocation().getSatelliteTime();
}
return 0;
}

2
foudations/mogo-commons/src/main/java/com/mogo/commons/utils/LocationUtils.java
View File

@@ -27,7 +27,7 @@ public class LocationUtils {
double carLat = carLocal.getLatitude();
double poiLon = pointLocal.getLon();
double poiLat = pointLocal.getLat();
float carAngle = carLocal.getBearing();
double carAngle = carLocal.getHeading();
// 计算车辆与点之间的夹角
int diffAngle = DrivingDirectionUtils.getDegreeOfCar2Poi(