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 848cd531f3..7de6227584 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 @@ -7,6 +7,7 @@ import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.network.utils.digest.DigestUtils +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger 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 @@ -106,6 +107,11 @@ object LineModel { */ private fun queryCarExecutableTaskList(isBackground:Boolean) { if(isRequesting.get()){ + CallerLogger.d(TAG,"正在同步请稍等") + val lastUpdateTime = SharedPrefsMgr.getInstance().getLong(EXECUTABLECHANGETIME, 0) + mBusLinesCallbackMap.forEach { callback -> + callback.value.onRefreshSuccess(lastUpdateTime) + } return } isRequesting.set(true) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt index f83b7d01a5..3fc675e3c2 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt @@ -240,6 +240,13 @@ object OrderModel { if (e is DataException) { } + LineModel.leaveStationSuccess() + isArrivedStation = false + onStartAutopilot() + + ThirdDeviceData.leaveStation() + + updateBusStatus() } override fun onComplete() { @@ -406,6 +413,18 @@ object OrderModel { if (e is DataException) { } + ThirdDeviceData.arriveStation() + d(TAG, "arrivedStation onComplete") + LineModel.stationList?.let { + LineModel.startStationIndex +=1 + val startStation = LineManager.getStations().second + if(LineModel.startStationIndex +1< it.size){ + val endStation = it[LineModel.startStationIndex +1] + LineManager.setStartAndEndStation(startStation,endStation) + } + } + LineModel.arrivedStationSuccess() + updateBusStatus() } override fun onComplete() {