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

[6.1.0] 美化模式下自驾按钮状态更新

Browse Source
This commit is contained in:
wangmingjun
2023-09-19 17:36:04 +08:00
parent c5cf6d63f8
commit a77bd16c0b
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/callback/ITaxiADASStatusCallback.java
View File

@@ -23,4 +23,6 @@ public interface ITaxiADASStatusCallback {
//自驾返回失败
void onStartAdasFailure();
void updateAutopilotStatus();
}

5
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiPresenter.java
View File

@@ -133,6 +133,11 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
runOnUIThread(() -> mView.stopAnimAndUpdateBtnStatus());
}
@Override
public void updateAutopilotStatus() {
mView.updateAutopilotStatus(CallerAutoPilotStatusListenerManager.INSTANCE.getState());
}
@Override
public void onNaviToEnd(boolean isAmap, boolean isShow) {
runOnUIThread(() -> mView.onNaviToEnd(isAmap, isShow));

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

@@ -322,10 +322,8 @@ object TaxiTaskModel {
DebugView.printInfoMsg("[自驾状态变化] afterValue=STATUS_AUTOPILOT_ENABLE，meaning=可自动驾驶，人工干预状态")
if ((FunctionBuildConfig.isDemoMode
&& checkCurrentTaskCondition()
&& (QueryCurrentTaskRespBean.isOrderOnTheWayToEnd(mCurrentTaskWithOrder)
|| QueryCurrentTaskRespBean.isOrderArriveAtEnd(mCurrentTaskWithOrder))
)
) {
&& QueryCurrentTaskRespBean.isStartTaskType(mCurrentTaskWithOrder)
)){
// 当美化模式（演示模式）开启时：且有订单、且为去往目的地状态，维持自动驾驶icon开启状态
return
}
@@ -334,8 +332,7 @@ object TaxiTaskModel {
DebugView.printInfoMsg("[自驾状态变化] afterValue=STATUS_AUTOPILOT_DISABLE，meaning=不可自动驾驶")
if ((FunctionBuildConfig.isDemoMode
&& checkCurrentTaskCondition()
&& (QueryCurrentTaskRespBean.isOrderOnTheWayToEnd(mCurrentTaskWithOrder)
|| QueryCurrentTaskRespBean.isOrderArriveAtEnd(mCurrentTaskWithOrder))
&& QueryCurrentTaskRespBean.isStartTaskType(mCurrentTaskWithOrder)
)
) {
// 当美化模式（演示模式）开启时：且有订单、且为去往目的地状态，维持自动驾驶icon开启状态
@@ -348,8 +345,7 @@ object TaxiTaskModel {
DebugView.printInfoMsg("[自驾状态变化] afterValue=STATUS_PARALLEL_DRIVING，meaning=平行驾驶中")
if (FunctionBuildConfig.isDemoMode) {
if ((checkCurrentTaskCondition()
&& (QueryCurrentTaskRespBean.isOrderOnTheWayToEnd(mCurrentTaskWithOrder)
|| QueryCurrentTaskRespBean.isOrderArriveAtEnd(mCurrentTaskWithOrder))
&& QueryCurrentTaskRespBean.isStartTaskType(mCurrentTaskWithOrder)
)
) { //订单中
// 当美化模式（演示模式）开启时：且有订单、且为去往目的地状态，维持自动驾驶icon开启状态
@@ -757,6 +753,7 @@ object TaxiTaskModel {
//注意: 需要去除到达乘客上车点的节点, 这个节点不拉取任务
if (result?.currentStatus == TaskStatusEnum.CompleteTask.code
) {
mADASStatusCallback?.updateAutopilotStatus()
mTaxiTaskWithOrderCallbackMap.forEach {
val listener = it.value
listener.onTaskCompleted(result)