[6.8.0]

[fea] [有待核销上传可以结束任务]
2024-11-29 11:14:31 +08:00
parent 1d885d1503
commit accaf2a35e
1 changed files with 64 additions and 70 deletions
--- 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<Boolean> {
-                        override fun onSubscribe(d: Disposable) {
-                            startTaskDisposable
-                            d(TAG, "endTask onSubscribe")
+            RepositoryManager.endTask(taskId)
+                ?.subscribeOn(Schedulers.io())
+                ?.observeOn(AndroidSchedulers.mainThread())
+                ?.subscribe(object : Observer<Boolean> {
+                    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()
+                    }
+                })
        }
    }