From 6bd6dfc8810add3bfe0268e78d34cc9dc3e74e95 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 27 Nov 2023 18:27:55 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.0]=20[charter]=20[=E9=9D=A0=E8=BE=B9?= =?UTF-8?q?=E5=81=9C=E8=BD=A6=E9=87=8D=E6=96=B0=E8=B5=B7=E6=AD=A5=E5=90=8E?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BE=8E=E5=8C=96=E6=A8=A1=E5=BC=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../magic/mogo/och/charter/presenter/DriverM1Presenter.kt | 7 +++++++ .../common/module/manager/beautifymode/BeautifyManager.kt | 3 ++- .../module/manager/stopsidemanager/StopSideManager.kt | 7 ++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt index 6d8131217c..46f911e6fc 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt @@ -23,6 +23,7 @@ import com.mogo.och.common.module.biz.callback.ILoginCallback import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager.OPERATION_ROAD_SIDE_TYPE import com.mogo.och.common.module.biz.constant.LoginStatusManager.isLogin import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager +import com.mogo.och.common.module.manager.beautifymode.BeautifyManager import com.mogo.och.common.module.manager.stopsidemanager.OCHPlanningActionsCallback import com.mogo.och.common.module.manager.stopsidemanager.StopSideStatus import com.mogo.och.common.module.manager.stopsidemanager.StopSideManager @@ -171,6 +172,12 @@ class DriverM1Presenter(view: DriverM1Fragment?) : OPERATION_ROAD_SIDE_TYPE ) } + StopSideStatus.EndingSuccess -> { + BeautifyManager.notifyViewChange(BeautifyManager.ChangeTypeEnum.STOPSITE_SUCCESS) + } + StopSideStatus.NOTHING -> { + BeautifyManager.notifyViewChange(BeautifyManager.ChangeTypeEnum.STOPSITE_SUCCESS_RUN) + } StopSideStatus.EndingFaile, StopSideStatus.NOSTART-> { DriverM1Model.get().pushOperationalToMsgBox( diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/beautifymode/BeautifyManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/beautifymode/BeautifyManager.kt index 047fb960e3..e962cdaca6 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/beautifymode/BeautifyManager.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/beautifymode/BeautifyManager.kt @@ -17,7 +17,8 @@ object BeautifyManager : IViewControlListener, IReceivedMsgListener { BEAUTIFY_TYPE,// 美化模式变化 ORDER_STATU_CHANGE,// 订单状态发生变化 ARRIVED_DEST,// 到站 - STOPSITE_SUCCESS// 靠边停车成功 + STOPSITE_SUCCESS,// 靠边停车成功 + STOPSITE_SUCCESS_RUN// 靠边停车成功后恢复为正在驾驶 } private val orderStatusChangeListeners = ConcurrentHashMap() diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/stopsidemanager/StopSideManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/stopsidemanager/StopSideManager.kt index f67668de5d..fbf4e26315 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/stopsidemanager/StopSideManager.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/stopsidemanager/StopSideManager.kt @@ -186,7 +186,12 @@ object StopSideManager : IMoGoAutopilotPlanningActionsListener { // 只响应第一次 }else{ stopSiteStatus = StopSideStatus.NOTHING - CallerLogger.d(SceneConstant.M_BUS+ TAG,"进入正常驾驶") + M_LISTENERS.forEach { + val tag = it.key + val listener = it.value + CallerLogger.d(SceneConstant.M_BUS+ TAG,"进入正常驾驶") + listener.onStartAutopilotFailure(StopSideStatus.NOTHING,false,"进入正常行驶中") + } } } else -> {}