From 072836e6476d7bdda07e7df77eb48d7159b6bf52 Mon Sep 17 00:00:00 2001 From: pangfan Date: Sat, 25 Jun 2022 10:51:51 +0800 Subject: [PATCH] =?UTF-8?q?[Bus/Taxi=20driver=20v2.8.0]=E8=BD=A8=E8=BF=B9?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=8F=8D=E9=A6=88=E4=BF=A1=E6=81=AFtoast?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=88=E5=8F=91=E7=89=88=E6=97=B6=E5=85=B3?= =?UTF-8?q?=E9=97=AD=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit bf4c20d0bcca69c12bca3da91c500912e3a92d56) --- .../java/com/mogo/och/bus/util/BusTrajectoryManager.java | 6 ++++++ .../java/com/mogo/och/taxi/utils/TaxiTrajectoryManager.java | 6 ++++++ 2 files changed, 12 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 c10ebca345..2c95fa04f1 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 @@ -6,6 +6,7 @@ import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.GsonUtils; +import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.och.bus.bean.BusRoutesResult; import com.mogo.och.bus.constant.BusConst; import com.mogo.och.bus.model.BusOrderModel; @@ -70,22 +71,27 @@ public class BusTrajectoryManager { if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.getCode())) { // 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发） CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹开始下载"); + ToastUtils.showShort("轨迹开始下载"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.getCode())) { // 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发） CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载成功"); + ToastUtils.showShort("轨迹下载成功"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.getCode())) { // 3. 轨迹管理_轨迹下载失败，本地无对应轨迹 CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地无对应轨迹"); + ToastUtils.showShort("轨迹下载失败，本地无对应轨迹"); } else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.getCode())) { // 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功 CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地有对应轨迹，认为成功"); + ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功"); } else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.getCode())) { // 5. 轨迹管理_轨迹下载超时 CallerLogger.INSTANCE.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载超时"); + ToastUtils.showShort("轨迹下载超时"); } } 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 7f34aa40f1..c65e1a4de4 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 @@ -6,6 +6,7 @@ import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.GsonUtils; +import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.och.taxi.bean.OrderQueryRespBean; import com.mogo.och.taxi.constant.TaxiConst; import com.mogo.och.taxi.constant.TaxiOrderStatusEnum; @@ -68,22 +69,27 @@ public class TaxiTrajectoryManager { if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.getCode())) { // 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发） CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹开始下载"); + ToastUtils.showShort("轨迹开始下载"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.getCode())) { // 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发） CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载成功"); + ToastUtils.showShort("轨迹下载成功"); stopTrajReqLoop(); } else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.getCode())) { // 3. 轨迹管理_轨迹下载失败，本地无对应轨迹 CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地无对应轨迹"); + ToastUtils.showShort("轨迹下载失败，本地无对应轨迹"); } else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.getCode())) { // 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功 CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() " + "轨迹下载失败，本地有对应轨迹，认为成功"); + ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功"); } else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.getCode())) { // 5. 轨迹管理_轨迹下载超时 CallerLogger.INSTANCE.d(M_TAXI + TAG, "onAutopilotGuardian() 轨迹下载超时"); + ToastUtils.showShort("轨迹下载超时"); } }