From 98fe897f6151e844e908ecec74446e006427042e Mon Sep 17 00:00:00 2001 From: pangfan Date: Tue, 25 Jul 2023 14:05:09 +0800 Subject: [PATCH] =?UTF-8?q?[3.4.0/2.4.0]=E5=90=AF=E5=8A=A8=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E7=8E=87=E4=BC=98=E5=8C=96=EF=BC=9Assm(=E8=BD=A8?= =?UTF-8?q?=E8=BF=B9=E4=B8=8B=E8=BD=BD=E6=A8=A1=E5=9D=97)ready=E5=90=8E?= =?UTF-8?q?=E5=86=8D=E6=AC=A1=E5=8F=91=E8=B5=B7=E8=BD=A8=E8=BF=B9=E4=B8=8B?= =?UTF-8?q?=E8=BD=BDrequest=EF=BC=88Taxi/Bus/=E6=8E=A5=E9=A9=B3/=E5=8C=85?= =?UTF-8?q?=E8=BD=A6=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/och/bus/util/BusTrajectoryManager.java | 4 ++++ .../mogo/och/charter/manager/CharterTrajectoryManager.kt | 4 ++++ .../java/com/magic/mogo/och/charter/model/DriverM1Model.kt | 4 ++++ .../main/java/com/mogo/och/bus/util/BusTrajectoryManager.java | 4 ++++ .../java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java | 4 ++++ .../com/mogo/och/sweeper/util/SweeperTrajectoryManager.java | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java index 6cf6eb90c4..930045f7bd 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java @@ -93,6 +93,10 @@ public class BusTrajectoryManager { // 5. 轨迹管理_轨迹下载超时 CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载超时"); // ToastUtils.showShort("轨迹下载超时"); + } else if ("ISSM_FUNC_AUTO_PILOT_READY".equals(guardianInfo.getCode())) { + // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。 + CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() ssm ready，再次发起下载"); + syncTrajectoryInfo(); } } diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt index df96f0bc00..39498449c5 100644 --- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt +++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt @@ -78,6 +78,10 @@ object CharterTrajectoryManager { // 5. 轨迹管理_轨迹下载超时 d(SceneConstant.M_CHARTER_D + TAG, "onAutopilotGuardian() 轨迹下载超时") // ToastUtils.showShort("轨迹下载超时"); + } else if ("ISSM_FUNC_AUTO_PILOT_READY" == guardianInfo.getCode()) { + // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。 + d(SceneConstant.M_CHARTER_D + TAG, "onAutopilotGuardian() ssm ready，再次发起下载") + syncTrajectoryInfo(get().getBusOrderResult()?.lineId!!) } } diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt index e77143325d..d03324e646 100644 --- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt +++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt @@ -860,4 +860,8 @@ class DriverM1Model { return mCurrentRoute } + + fun getBusOrderResult(): QueryCurrentOrderResponse.Result?{ + return mCurrentOrder + } } \ No newline at end of file diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java index aafcea35ee..fed001d399 100644 --- a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java +++ b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java @@ -92,6 +92,10 @@ public class BusTrajectoryManager { // 5. 轨迹管理_轨迹下载超时 CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载超时"); // ToastUtils.showShort("轨迹下载超时"); + } else if ("ISSM_FUNC_AUTO_PILOT_READY".equals(guardianInfo.getCode())) { + // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。 + CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() ssm ready，再次发起下载"); + syncTrajectoryInfo(); } } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java index 8d58a0199e..a330d16251 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java @@ -95,6 +95,10 @@ public class TaxiTrajectoryManager { // 5. 轨迹管理_轨迹下载超时 CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载超时"); // ToastUtils.showShort("轨迹下载超时"); + } else if ("ISSM_FUNC_AUTO_PILOT_READY".equals(guardianInfo.getCode())) { + // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。 + CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() ssm ready，再次发起下载"); + syncTrajectoryInfo(); } } diff --git a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java index 878cb08b78..dd61622c93 100644 --- a/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java +++ b/OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperTrajectoryManager.java @@ -87,6 +87,10 @@ public class SweeperTrajectoryManager { // 5. 轨迹管理_轨迹下载超时 CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotGuardian() 轨迹下载超时"); // ToastUtils.showShort("轨迹下载超时"); + } else if ("ISSM_FUNC_AUTO_PILOT_READY".equals(guardianInfo.getCode())) { + // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。 + CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotGuardian() ssm ready，再次发起下载"); + // TODO: 2023/7/25 } }