From cd1b64726fab88955b478a08c5e5821b058ae3ab Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 22 May 2023 10:29:01 +0800 Subject: [PATCH] =?UTF-8?q?[gradle]=20[3.2.0]=20[=E6=96=87=E6=A1=88?= =?UTF-8?q?=E3=80=81=E5=90=AF=E5=8A=A8=E8=87=AA=E9=A9=BE=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E5=90=8E=E8=AF=B7=E6=B1=82=E5=85=A8=E5=B1=80=E8=BD=A8=E8=BF=B9?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bus/passenger/model/CharterPassengerModel.kt | 16 +++++++++------- .../devicemanage/LightAirconditionDoorManager.kt | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt index 6149b0aeab..f095ddfb2f 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt @@ -220,18 +220,20 @@ object CharterPassengerModel { object : IMoGoAutopilotStatusListener { override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) { val state = autoPilotStatusInfo.state - when (state) { - IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> {} - IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {} - IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> {} - IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> {} - else -> {} - } if(mPreAutoStatus!=state){ mPreAutoStatus = state mAutoStatusChnageListener.forEach { it.value.onAutoStatusChange(state) } + when (state) { + IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> { + CallerAutoPilotControlManager.getGlobalPath() + } + IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {} + IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> {} + IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> {} + else -> {} + } } } override fun onAutopilotArriveAtStation(arrivalNotification: MessagePad.ArrivalNotification?) { diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt index 7934b36787..e1f155cc2f 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/devicemanage/LightAirconditionDoorManager.kt @@ -52,7 +52,7 @@ object LightAirconditionDoorManager { return if(location.gnssSpeed<0.01){ null }else{ - "车辆行驶中不可以开门哦~" + "车辆行驶中不可以开关门哦~" } } }