From ae1a678ee80d8581e8e8e7cb4142bfffcfe62655 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 26 Jun 2024 12:04:02 +0800 Subject: [PATCH] =?UTF-8?q?[6.4.6]=20[fea]=20[=E6=98=AF=E5=90=A6=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E9=AB=98=E7=B2=BE=E5=9C=B0=E5=9B=BE=E8=BD=A8=E8=BF=B9?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/bus/model/OrderModel.java | 17 +++-- .../src/main/res/layout/bus_base_fragment.xml | 11 +++- .../mogo/och/charter/model/DriverM1Model.kt | 24 ++++--- .../main/res/layout/charter_base_fragment.xml | 10 ++- .../passenger/model/CharterPassengerModel.kt | 10 +-- .../manager/autopilot/line/LineManager.kt | 31 +++++++++ .../module/wigets/map/drawline/LineView.kt | 60 ++++++++++++++++++ .../wigets/map/orderstatus/OrderStatusView.kt | 2 +- .../drawable-nodpi/common_map_line_close.png | Bin 0 -> 20341 bytes .../drawable-nodpi/common_map_line_open.png | Bin 0 -> 24632 bytes .../mogo/och/shuttle/model/OrderModel.java | 15 +++-- .../main/res/layout/shuttle_base_fragment.xml | 10 ++- .../com/mogo/och/taxi/model/TaxiModel.java | 8 +-- .../och/taxi/presenter/TaxiPresenter.java | 4 +- .../main/res/layout/taxi_base_fragment.xml | 11 +++- .../taxi/passenger/model/AutopilotManager.kt | 10 +-- .../taxi/ui/routing/TaxiRoutingModel.kt | 7 +- .../taxi/ui/task/TaxiCurrentTaskViewModel.kt | 2 + .../unmanned/taxi/ui/task/TaxiTaskModel.kt | 16 ++--- .../layout/unmanned_taxi_base_fragment.xml | 11 +++- .../passenger/model/AutopilotManager.kt | 7 +- 21 files changed, 201 insertions(+), 65 deletions(-) create mode 100644 OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/line/LineManager.kt create mode 100644 OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/drawline/LineView.kt create mode 100644 OCH/common/common/src/main/res/drawable-nodpi/common_map_line_close.png create mode 100644 OCH/common/common/src/main/res/drawable-nodpi/common_map_line_open.png diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java index 41484f0972..19b8786a6a 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java @@ -48,6 +48,7 @@ import com.mogo.och.bus.util.BusSendTripInfoManager; import com.mogo.och.bus.util.BusTrajectoryManager; import com.mogo.och.bus.util.BusVoiceManager; import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager; +import com.mogo.och.common.module.manager.autopilot.line.LineManager; import com.mogo.och.common.module.manager.socket.lan.ILanMessageListener; import com.mogo.och.common.module.manager.socket.lan.LanSocketManager; import com.mogo.och.common.module.manager.socket.lan.bean.AppConnectMsg; @@ -197,6 +198,8 @@ public class OrderModel { }); } + // 初始化调用 + // 登录状态发生变化调用 public void queryBusCacheRoutes(){ String loginStr = CacheDataManager.Companion.getInstance().getCacheData( @@ -720,7 +723,7 @@ public class OrderModel { FunctionBuildConfig.isPassStartAutopilotCommand); //3、距离轨迹15m计算 - String resion = TrajectoryAndDistanceManager.INSTANCE.canStartAutopilot((long)busRoutesResult.getLineId()); + String resion = OchAutoPilotManager.canStartAutoPilot(busRoutesResult.getLineId()); if(TrajectoryAndDistanceManager.errorTypeNoneLineId.equals(resion)){ MogoLocation nextStationPoint = new MogoLocation(); if (backgroundCurrentStationIndex < stationList.size() - 1) { @@ -733,7 +736,7 @@ public class OrderModel { currentStationPoint.setLongitude(busStationBean.getGcjLon()); currentStationPoint.setLatitude(busStationBean.getGcjLat()); setTrajectoryStation(currentStationPoint,nextStationPoint, (long)busRoutesResult.getLineId()); - resion = TrajectoryAndDistanceManager.INSTANCE.canStartAutopilot((long)busRoutesResult.getLineId()); + resion = OchAutoPilotManager.canStartAutoPilot(busRoutesResult.getLineId()); } if(!StringUtils.isEmpty(resion)){ ToastUtils.showShort(resion); @@ -742,9 +745,7 @@ public class OrderModel { } //4、ssm 给出数据 - if (!FunctionBuildConfig.isDemoMode && !OCHAdasAbilityManager.getInstance().getAutopilotAbilityStatus()) { - ToastUtils.showLong(OCHAdasAbilityManager.getInstance().getAutopilotUnAbilityReason() + - ", 请稍候重试"); + if (!OchAutoPilotManager.canStartAutoPilotSSM()) { triggerUnableStartAPReasonEvent(); return; } @@ -962,11 +963,15 @@ public class OrderModel { * @param result */ private void updateBusStatus(BusRoutesResult result) { - if (result == null) return; + if (result == null) { + LineManager.setLineId(-1); + return; + } busRoutesResult = result; List site = result.getSites(); currentTaskId = result.getTaskId(); currentLineId = result.getLineId(); + LineManager.setLineId(currentLineId); stationList.clear(); stationList.addAll(site); diff --git a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml index a32dea82da..8e2b52baa1 100644 --- a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml +++ b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml @@ -258,6 +258,7 @@ android:layout_height="@dimen/dp_142"/> + + + +