From accaf2a35e0b4990c351a7a5355e07d2884be41a Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 29 Nov 2024 11:14:31 +0800 Subject: [PATCH] =?UTF-8?q?[6.8.0]=20[fea]=20[=E6=9C=89=E5=BE=85=E6=A0=B8?= =?UTF-8?q?=E9=94=80=E4=B8=8A=E4=BC=A0=E5=8F=AF=E4=BB=A5=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/weaknet/model/LineModel.kt | 134 +++++++++--------- 1 file changed, 64 insertions(+), 70 deletions(-) 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 eb92bb91d1..d2d2d88267 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 @@ -319,86 +319,80 @@ object LineModel { fun endTask() { currentTask?.taskId?.let { taskId -> - if (RepositoryManager.canCanEndTask(taskId)) { - RepositoryManager.endTask(taskId) - ?.subscribeOn(Schedulers.io()) - ?.observeOn(AndroidSchedulers.mainThread()) - ?.subscribe(object : Observer { - override fun onSubscribe(d: Disposable) { - startTaskDisposable - d(TAG, "endTask onSubscribe") + RepositoryManager.endTask(taskId) + ?.subscribeOn(Schedulers.io()) + ?.observeOn(AndroidSchedulers.mainThread()) + ?.subscribe(object : Observer { + override fun onSubscribe(d: Disposable) { + startTaskDisposable + d(TAG, "endTask onSubscribe") + } + + override fun onError(e: Throwable) { + d(TAG, "endTask onError${e.printStackTrace()}") + if (e is DataException) { + } + if (RepositoryManager.supportDb()) { + isGoingToNextStation = false - override fun onError(e: Throwable) { - d(TAG, "endTask onError${e.printStackTrace()}") - if (e is DataException) { - + ThirdDeviceData.endTask() + ThirdDeviceData.sendTaskDetailsToClients() + ShuttleVoiceManager.endOrderBus() + // 取消自驾 + CallerAutoPilotControlManager.cancelAutoPilot() + currentTask = null + LineManager.setLineInfo(null) + LineManager.setStartAndEndStation(null, null) + LanSocketManager.sendMsgToClient(WriteOffResultMsg(-99, "","", System.currentTimeMillis(),LineManager.lineInfos?.lineId?:0,LineManager.getStations()?.first?.siteId?.toLong()?:0L)) + LineModel.callEyeMap(1) + stationList = mutableListOf() + startStationIndex = 0 + mBusLinesCallbackMap.forEach { + it.value.onCompleteTask() } - if (RepositoryManager.supportDb()) { - isGoingToNextStation = false - - ThirdDeviceData.endTask() - ThirdDeviceData.sendTaskDetailsToClients() - ShuttleVoiceManager.endOrderBus() - // 取消自驾 - CallerAutoPilotControlManager.cancelAutoPilot() - currentTask = null - LineManager.setLineInfo(null) - LineManager.setStartAndEndStation(null, null) - LanSocketManager.sendMsgToClient(WriteOffResultMsg(-99, "","", System.currentTimeMillis(),LineManager.lineInfos?.lineId?:0,LineManager.getStations()?.first?.siteId?.toLong()?:0L)) - LineModel.callEyeMap(1) - stationList = mutableListOf() - startStationIndex = 0 - mBusLinesCallbackMap.forEach { - it.value.onCompleteTask() - } - val changeInfo = - "taskId:${currentTask?.taskId}--lineInfo:${LineManager.lineInfos}" - OchChainLogManager.writeChainLog("结束任务", changeInfo) - } else { - ToastUtils.showShort("结束任务失败请稍后再试") - mBusLinesCallbackMap.forEach { - it.value.onCompleteTaskFail() - } + val changeInfo = + "taskId:${currentTask?.taskId}--lineInfo:${LineManager.lineInfos}" + OchChainLogManager.writeChainLog("结束任务", changeInfo) + } else { + ToastUtils.showShort("结束任务失败请稍后再试") + mBusLinesCallbackMap.forEach { + it.value.onCompleteTaskFail() } } + } - override fun onComplete() { - d(TAG, "endTask onComplete") - } + override fun onComplete() { + d(TAG, "endTask onComplete") + } - override fun onNext(data: Boolean) { - d(TAG, "endTask onNext ${data}") - if (data) { - isGoingToNextStation = false + override fun onNext(data: Boolean) { + d(TAG, "endTask onNext ${data}") + if (data) { + isGoingToNextStation = false - ThirdDeviceData.endTask() - ThirdDeviceData.sendTaskDetailsToClients() - ShuttleVoiceManager.endOrderBus() - // 取消自驾 - CallerAutoPilotControlManager.cancelAutoPilot() - currentTask = null - LineManager.setLineInfo(null) - LineManager.setStartAndEndStation(null, null) - LanSocketManager.sendMsgToClient(WriteOffResultMsg(-99, "","", System.currentTimeMillis(),LineManager.lineInfos?.lineId?:0,LineManager.getStations()?.first?.siteId?.toLong()?:0L)) - stationList = mutableListOf() - startStationIndex = 0 - LineModel.callEyeMap(2) - mBusLinesCallbackMap.forEach { - it.value.onCompleteTask() - } - val changeInfo = - "taskId:${currentTask?.taskId}--lineInfo:${LineManager.lineInfos}" - OchChainLogManager.writeChainLog("结束任务", changeInfo) + ThirdDeviceData.endTask() + ThirdDeviceData.sendTaskDetailsToClients() + ShuttleVoiceManager.endOrderBus() + // 取消自驾 + CallerAutoPilotControlManager.cancelAutoPilot() + currentTask = null + LineManager.setLineInfo(null) + LineManager.setStartAndEndStation(null, null) + LanSocketManager.sendMsgToClient(WriteOffResultMsg(-99, "","", System.currentTimeMillis(),LineManager.lineInfos?.lineId?:0,LineManager.getStations()?.first?.siteId?.toLong()?:0L)) + stationList = mutableListOf() + startStationIndex = 0 + LineModel.callEyeMap(2) + mBusLinesCallbackMap.forEach { + it.value.onCompleteTask() } - onComplete() + val changeInfo = + "taskId:${currentTask?.taskId}--lineInfo:${LineManager.lineInfos}" + OchChainLogManager.writeChainLog("结束任务", changeInfo) } - }) - }else{ - ToastUtils.showShort("有待上传核销数据请稍等") - // 主动上报一次 - EventModel.notifySyn() - } + onComplete() + } + }) } }