From bc27dfefb0c736781d9c1498f8a472bb912f5b13 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 27 Nov 2024 15:11:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[6.8.0]=20[fix]=20[=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E4=BB=BB=E5=8A=A1=E5=8F=98=E6=9B=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/och/weaknet/model/LineModel.kt | 5 +++++ .../mogo/och/weaknet/repository/db/repository/TaskDb.kt | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt index 363e5ff686..0f9e9ce4af 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt @@ -16,6 +16,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS import com.mogo.eagle.core.utilcode.util.NetworkUtils import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.och.common.module.biz.login.LoginStatusManager import com.mogo.och.common.module.manager.autopilot.line.LineManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.loop.BizLoopManager @@ -454,6 +455,10 @@ object LineModel { } fun endTaskByOther(taskId: Long,plateNumber:String) { + if(LoginStatusManager.getLoginInfo()?.plateNumber==plateNumber){ + CallerLogger.d(TAG,"当前车辆消耗任务") + return + } RepositoryManager.endTaskByOther(taskId) mBusLinesCallbackMap.forEach { callback -> callback.value.onEndTaskByOther(taskId,plateNumber) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskDb.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskDb.kt index 3901125282..2becf9b6bf 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskDb.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskDb.kt @@ -151,7 +151,12 @@ object TaskDb : IDbRepository { fun endTask(taskId: Long) { BizLoopManager.runInIoThread{ - taskDataDao?.endTask(taskId) + val taskInfo = taskDataDao?.queryTaskByTaskIdOne(taskId) + if(taskInfo!=null){ + if (taskInfo.status == TaskDataBean.unUse) { + taskDataDao?.endTask(taskId) + } + } } } From e0d93bb8d522cf3c664545097bc7a4170dad8dca Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 27 Nov 2024 15:13:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[6.8.0]=20[fix]=20[=E6=95=88=E6=9E=9C?= =?UTF-8?q?=E7=9B=B8=E5=8F=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taxi/ui/routing/routingrunning/RoutingRunningView.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt index 7778358d1e..ad17294980 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt @@ -96,14 +96,14 @@ class RoutingRunningView: ConstraintLayout, RoutingRunningModel.RoutingRuningCal override fun confirm() { swtichViewModel?.showLoading() viewModel?.endGrayTask( grayId, - EndGrayTaskFeedbackType.USABLE_YES, + EndGrayTaskFeedbackType.USABLE_NO, occurrenceTime) } override fun cancel() { swtichViewModel?.showLoading() viewModel?.endGrayTask( grayId, - EndGrayTaskFeedbackType.USABLE_NO, + EndGrayTaskFeedbackType.USABLE_YES, occurrenceTime) } }) From 5e9e0ee8b4c68f1f9730338665ed49c9fbb03a5b Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 27 Nov 2024 15:35:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[6.8.0]=20[fix]=20[=E7=BA=BF=E8=B7=AF?= =?UTF-8?q?=E5=8F=AF=E7=94=A8=20=E9=A2=9C=E8=89=B2=E5=8F=98=E6=9B=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taxi/ui/routing/routingrunning/RoutingRunningView.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt index ad17294980..28466fe778 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt @@ -89,21 +89,21 @@ class RoutingRunningView: ConstraintLayout, RoutingRunningModel.RoutingRuningCal .tips("请点击按钮反馈验证结果") .showClose(true) .cancelTextColor(R.color.taxi_color_FF4E41) - .cancelStr("线路可用") - .confirmStr("线路不可用") + .cancelStr("线路不可用") + .confirmStr("线路可用") .status(CommonDialogStatus.Status.success) .clickListener(object :CommonDialogStatus.ClickListener{ override fun confirm() { swtichViewModel?.showLoading() viewModel?.endGrayTask( grayId, - EndGrayTaskFeedbackType.USABLE_NO, + EndGrayTaskFeedbackType.USABLE_YES, occurrenceTime) } override fun cancel() { swtichViewModel?.showLoading() viewModel?.endGrayTask( grayId, - EndGrayTaskFeedbackType.USABLE_YES, + EndGrayTaskFeedbackType.USABLE_NO, occurrenceTime) } })