From ed91f30f3958b43b58ecd6ac8cb159832b5d6273 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 28 Nov 2024 14:08:13 +0800 Subject: [PATCH] =?UTF-8?q?[6.8.0]=20[fix]=20[=E7=BB=93=E6=9D=9F=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weaknet/repository/db/repository/TaskDb.kt | 18 ++++++++++++------ .../repository/line/impl/WeaknetRepository.kt | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) 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 2becf9b6bf..6971237eaf 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,12 +151,7 @@ object TaskDb : IDbRepository { fun endTask(taskId: Long) { BizLoopManager.runInIoThread{ - val taskInfo = taskDataDao?.queryTaskByTaskIdOne(taskId) - if(taskInfo!=null){ - if (taskInfo.status == TaskDataBean.unUse) { - taskDataDao?.endTask(taskId) - } - } + taskDataDao?.endTask(taskId) } } @@ -182,6 +177,17 @@ object TaskDb : IDbRepository { } } + fun endTaskByOther(taskId: Long) { + BizLoopManager.runInIoThread{ + val taskInfo = taskDataDao?.queryTaskByTaskIdOne(taskId) + if(taskInfo!=null){ + if (taskInfo.status == TaskDataBean.unUse) { + taskDataDao?.endTask(taskId) + } + } + } + } + interface TaskStatusCallback{ fun startSuccess() diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt index d139bd1419..30030990f7 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt @@ -315,7 +315,7 @@ class WeaknetRepository : ILineRepository { } override fun endTaskByOther(taskId: Long) { - TaskDb.endTask(taskId) + TaskDb.endTaskByOther(taskId) } override fun queryCarExecutableTaskList(