yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.0

Browse Source
This commit is contained in:
xuxinchao
2024-10-25 17:30:29 +08:00
parent b7d39ce6cd 76d1ec93b5
commit 55e990f94a
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt
View File

@@ -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)

19
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt
View File

@@ -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() {