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

Merge branch 'dev_robotaxi-d-app-module_290_220715_2.9.0' into 'test_robotaxi-d-app-module_290_220715_2.9.0.1'

Browse Source 
[290] taxi司机端订单到站时并在美化模式下，自动驾驶按钮状态为自驾中状态

See merge request zhjt/AndroidApp/MoGoEagleEye!128
This commit is contained in:
wangmingjun
2022-08-15 02:47:30 +00:00
parent 22b098ce81 164c2eddee
commit 4db3d97dd0
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
View File

@@ -1143,7 +1143,8 @@ public class TaxiModel {
} else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) {
if (FunctionBuildConfig.isDemoMode
&& checkCurrentOCHOrder()
&& getCurOrderStatus() == TaxiOrderStatusEnum.OnTheWayToEnd) {
&& (getCurOrderStatus() == TaxiOrderStatusEnum.OnTheWayToEnd
|| getCurOrderStatus() == TaxiOrderStatusEnum.ArriveAtEnd)) {
// 当美化模式（演示模式）开启时：且有订单、且为去往目的地状态，维持自动驾驶icon开启状态
return;
}
@@ -1154,7 +1155,8 @@ public class TaxiModel {
} else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE) {
if (FunctionBuildConfig.isDemoMode
&& checkCurrentOCHOrder()
&& getCurOrderStatus() == TaxiOrderStatusEnum.OnTheWayToEnd) {
&& (getCurOrderStatus() == TaxiOrderStatusEnum.OnTheWayToEnd
|| getCurOrderStatus() == TaxiOrderStatusEnum.ArriveAtEnd)) {
// 当美化模式（演示模式）开启时：且有订单、且为去往目的地状态，维持自动驾驶icon开启状态
return;
}
@@ -1166,7 +1168,8 @@ public class TaxiModel {
}else if (state == IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING){
if (FunctionBuildConfig.isDemoMode
&& checkCurrentOCHOrder()
&& getCurOrderStatus() == TaxiOrderStatusEnum.OnTheWayToEnd) {
&& (getCurOrderStatus() == TaxiOrderStatusEnum.OnTheWayToEnd
|| getCurOrderStatus() == TaxiOrderStatusEnum.ArriveAtEnd)) {
// 当美化模式（演示模式）开启时：且有订单、且为去往目的地状态，维持自动驾驶icon开启状态
return;
}