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

Merge branch 'dev_robotaxi-d_230809_6.0.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robotaxi-d_230809_6.0.0

Browse Source
This commit is contained in:
aibingbing
2023-09-07 14:52:43 +08:00
parent ae72005195 28340cc459
commit 07e07ef127
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
View File

@@ -1096,8 +1096,7 @@ public class TaxiModel {
if (getCurOrderStatus() == TaxiOrderStatusEnum.OnTheWayToStart) {
judgeStartStation(gnssInfo);
}
if (getCurOrderStatus() == TaxiOrderStatusEnum.OnTheWayToEnd &&
CallerAutoPilotStatusListenerManager.INSTANCE.getState() != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) {
if (getCurOrderStatus() == TaxiOrderStatusEnum.OnTheWayToEnd) {
judgeEndStation(gnssInfo);
}
}
@@ -1142,15 +1141,23 @@ public class TaxiModel {
CallerLogger.i(M_TAXI + TAG, "judgeEndStation() stationAngle = " + stationAngle);
if (!checkCurrentOCHOrder()
|| getCurOrderStatus() != TaxiOrderStatusEnum.ArriveAtEnd
) {
CallerLogger.i(M_TAXI + TAG, "order exception or order ArriveAtEnd");
return;
}
//3、刚过站且过站距离在15m内， 提交到站
if (stationAngle > 90 && distance <= TaxiConst.ARRIVE_AT_START_STATION_DISTANCE){
if (!checkCurrentOCHOrder()
|| (getCurOrderStatus() == TaxiOrderStatusEnum.ArriveAtEnd)) {
CallerLogger.i(M_TAXI + TAG, "order exception or order ArriveAtEnd");
return;
}
if (stationAngle > 90) {
CallerLogger.i(M_TAXI + TAG, "judgeEndStation() = 刚过站且在15m内");
arriveTerminal();
} else {
// 4、 没有过站距离小于15m 速度小于0.3(根据M1来的模数 可能要调)
if (currentLocation.getGnssSpeed() < 0.3) {
CallerLogger.i(TAG, "judgeEndStation() = 没有过站、速度基本为零且在15m内")
arriveTerminal();
}
}
}

4
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
View File

@@ -1279,8 +1279,8 @@ object TaxiTaskModel {
)
submitArriveSite(endSite.siteId, true)
} else {
// 4、 没有过站距离小于15m 速度小于0.5(根据M1来的模数 可能要调)
if (currentLocation.gnssSpeed < 0.5) {
// 4、 没有过站距离小于15m 速度小于0.3(根据M1来的模数 可能要调)
if (currentLocation.gnssSpeed < 0.3) {
i(TAG, "judgeEndStation() = 没有过站、速度基本为零且在15m内")
DebugView.printInfoMsg(
"[自车定位围栏] 触发围栏，任务类型：${