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

Merge remote-tracking branch 'origin/dev_robotaxi-d-app-module_265_220329_2.6.5' into dev_robotaxi-d-app-module_265_220329_2.6.5

Browse Source
This commit is contained in:
donghongyu
2022-04-12 15:42:13 +08:00
parent f18db68dd6 101ac56f11
commit 6ee79fd1b9
9 changed files with 181 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/IdentifyDataDrawer.java
View File

@@ -141,7 +141,7 @@ public class IdentifyDataDrawer {
CallerLogger.INSTANCE.d(M_HMI + "arrow47", "uuid: " + data.getUuid() + " , 40~90差值范围 , 上一帧 : " + cacheData.getHeading() + " , 当前帧 : " + data.getHeading());
}
if (Math.abs(cacheData.getHeading() - data.getHeading()) > 90) {
double degree = DrivingDirectionUtils.getDegreeOfCar2Poi(cacheData.getLongitude(), cacheData.getLatitude(), data.getLongitude(), data.getLatitude(), cacheData.getHeading());
int degree = DrivingDirectionUtils.getDegreeOfCar2Poi(cacheData.getLongitude(), cacheData.getLatitude(), data.getLongitude(), data.getLatitude(), Double.valueOf(cacheData.getHeading()).intValue());
if (degree > 90) {
CallerLogger.INSTANCE.d(M_HMI + "arrow47", "uuid: " + data.getUuid() + " , 夹角 : " + degree + " , 修正 上一帧 : " + cacheData.getHeading() + " , 当前帧 : " + data.getHeading());
correctData = data.toBuilder().setHeading(cacheData.getHeading()).build();

4
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java
View File

@@ -222,9 +222,11 @@ public class SmallMapDirectionView
double poiLon = pointLocal.longitude;
double poiLat = pointLocal.latitude;
float carAngle = carLocal.getBearing();
// 计算车辆与点之间的夹角
long diffAngle = DrivingDirectionUtils.getDegreeOfCar2Poi(
int diffAngle = DrivingDirectionUtils.getDegreeOfCar2Poi(
carLon, carLat, poiLon, poiLat, (int) carAngle);
return diffAngle <= 90;
}

2
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MogoLatLng.java
View File

@@ -26,8 +26,6 @@ public class MogoLatLng implements Parcelable {
public String provider;
public double acceleration;
public MogoLatLng( double lat, double lon ) {
this.lat = lat;
this.lon = lon;

18
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/MogoLocation.java
View File

@@ -31,8 +31,6 @@ public class MogoLocation implements Cloneable, Parcelable {
private String floor = "";
private int gpsAccuracyStatus = 0;
private int satellite = 0;
private long duration = 0;
private float acceleration = 0f;
public float getBearing() {
return bearing;
@@ -154,22 +152,6 @@ public class MogoLocation implements Cloneable, Parcelable {
this.gpsAccuracyStatus = gpsAccuracyStatus;
}
public long getDuration() {
return duration;
}
public void setDuration(long duration) {
this.duration = duration;
}
public void setAcceleration(float acceleration) {
this.acceleration = acceleration;
}
public float getAcceleration() {
return this.acceleration;
}
public int getSatellite() {
return satellite;
}