From 50ad57a3c11c8b42d0dcb606b9e731f31f6aa369 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 6 Sep 2023 13:30:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[6.0.0]=20=E6=9A=82=E5=81=9C=E6=8E=A5?= =?UTF-8?q?=E5=8D=95=E8=AF=AD=E9=9F=B3=E6=92=AD=E6=8A=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt | 11 ----------- .../och/taxi/ui/task/TaxiCurrentTaskViewModel.kt | 3 ++- .../java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt | 12 ++++++++++++ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt index c8b1583d07..3ee54ae2d4 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt @@ -355,9 +355,6 @@ class TaxiCurrentTaskFragment : BaseFragment(), if (order != null && currentStatus == TaskStatusEnum.CompleteTask.code) { handleOrderView(order) updateOrderUI(order) - if (order.orderStatus <= TaxiOrderStatusEnum.ArriveAtStart.code){ - VoiceNotice.showNotice("已为您接到订单") - } } } @@ -379,9 +376,6 @@ class TaxiCurrentTaskFragment : BaseFragment(), if (order != null && currentStatus == TaskStatusEnum.CompleteTask.code) { updateOrderUI(order) - if (order.orderStatus <= TaxiOrderStatusEnum.ArriveAtStart.code){ - VoiceNotice.showNotice("已为您接到订单") - } return } if (startSite == null || endSite == null) return @@ -401,11 +395,6 @@ class TaxiCurrentTaskFragment : BaseFragment(), updatePathwayPoint(taskType,endSite?.siteName) handleOrderView(it) updateOrderUI(it) - if (taskType == TaskTypeEnum.ToOrderStartTask.code - && currentStatus == TaskStatusEnum.CompleteTask.code - && order.orderStatus == TaxiOrderStatusEnum.ArriveAtStart.code){ - VoiceNotice.showNotice("已到达上车地点，等待乘客上车") - } } } } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt index 2f7c1d0ecf..beb22e68c5 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt @@ -268,7 +268,8 @@ class TaxiCurrentTaskViewModel : BaseViewModel(), currentTaskWithOrder: QueryCurrentTaskRespBean.Result? ) { if (currentTaskWithOrder?.endSite != null && currentTaskWithOrder.startSite != null - && currentTaskWithOrder.currentStatus < TaskStatusEnum.CompleteTask.code + && (currentTaskWithOrder.currentStatus < TaskStatusEnum.CompleteTask.code + ||currentTaskWithOrder.order != null) ) { VoiceNotice.showNotice("暂停接单啦！要完成当前订单哦") return diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt index 5e45c87776..6b99d1e383 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt @@ -697,8 +697,20 @@ object TaxiTaskModel { || !mCurrentTaskWithOrder!!.equals(result) ) { d(TAG, "queryCurrentTaskOnce: 更新本地数据") + mCurrentTaskWithOrder = result + if (result.order != null && result.currentStatus == TaskStatusEnum.CompleteTask.code + && result.servingStatus == 1){ + if (result.order!!.orderStatus <= TaxiOrderStatusEnum.ArriveAtStart.code) { + VoiceNotice.showNotice("已为您接到订单") + } + if (result.taskType == TaskTypeEnum.ToOrderStartTask.code + && result.order!!.orderStatus == TaxiOrderStatusEnum.ArriveAtStart.code){ + VoiceNotice.showNotice("已到达上车地点，等待乘客上车") + } + } + // 任务为空 if (result.endSite == null && result.order == null) { d(TAG, "queryCurrentTaskOnce: 任务为空") From 0333cf546414bb6e7badb1e40c1afd4997890cef Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 6 Sep 2023 13:49:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[6.0.0]=20[log]=20[=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=80=9F=E5=BA=A6=E6=97=A5=E5=BF=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/distancemamager/TrajectoryAndDistanceManager.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt index 8e8c7838bb..ac302ad156 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt @@ -243,7 +243,7 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{ BizLoopManager.setLoopFunction(TAGDISTANCE, LoopInfo(1, ::calculateDistance, scheduler = Schedulers.computation() )) - d(SceneConstant.M_BUS_P + TAG, "开始路距计算") + d(M_OCHCOMMON + TAG, "开始路距计算") } /** @@ -251,7 +251,7 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{ */ private fun endCalculateDistanceLoop() { BizLoopManager.removeLoopFunction(TAGDISTANCE) - d(SceneConstant.M_BUS_P + TAG, "结束路距计算") + d(M_OCHCOMMON + TAG, "结束路距计算") } @@ -260,7 +260,7 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{ location: MogoLocation, ) { val autoPilotState = CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().state - val locationInfo = "自动驾驶状态:$autoPilotState line信息：${lineId}定位信息:${location.latitude},${location.longitude},${location.heading}" + val locationInfo = "自动驾驶状态:$autoPilotState line信息：${lineId}定位信息:${location.latitude},${location.longitude},${location.heading} 当前速度:${location.gnssSpeed}" if (mRoutePoints.isNullOrEmpty()) return // 计算起始站点在轨迹中的信息 这个是一个常量 if (startStationInfo.stationPoint != null