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

[6.8.0]

Browse Source 
[fix]
[站点展示]
This commit is contained in:
yangyakun
2024-11-29 11:11:40 +08:00
parent f2dfb4b2cb
commit 1d885d1503
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -346,7 +346,7 @@ object LineModel {
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(true)
LineModel.callEyeMap(1)
stationList = mutableListOf()
startStationIndex = 0
mBusLinesCallbackMap.forEach {
@@ -381,9 +381,9 @@ object LineModel {
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(true)
stationList = mutableListOf()
startStationIndex = 0
LineModel.callEyeMap(2)
mBusLinesCallbackMap.forEach {
it.value.onCompleteTask()
}
@@ -426,8 +426,9 @@ object LineModel {
}
}
fun callEyeMap(isClear:Boolean){
if(isClear) {
fun callEyeMap(index:Int){
CallerLogger.d(TAG,"执行${index} callEyeMap${stationList?.size}")
if(stationList.isNullOrEmpty()){
val ochInfo = OchInfo(1, mutableListOf())
ochInfo.siteMarkerList = mutableListOf()
OchChainLogManager.writeChainLog("地图","站点信息:${ochInfo}")

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

@@ -294,6 +294,8 @@ object OrderModel {
ThirdDeviceData.leaveStation()
updateBusStatus()
LineModel.callEyeMap(3)
}
override fun onComplete() {
@@ -309,6 +311,7 @@ object OrderModel {
ThirdDeviceData.leaveStation()
updateBusStatus()
LineModel.callEyeMap(4)
}
}
})
@@ -468,7 +471,7 @@ object OrderModel {
if(LineModel.startStationIndex +1< it.size){
val endStation = it[LineModel.startStationIndex +1]
LineManager.setStartAndEndStation(startStation,endStation)
LineModel.callEyeMap(false)
LineModel.callEyeMap(5)
}
}
LineModel.arrivedStationSuccess()
@@ -484,7 +487,7 @@ object OrderModel {
if(LineModel.startStationIndex +1< it.size){
val endStation = it[LineModel.startStationIndex +1]
LineManager.setStartAndEndStation(startStation,endStation)
LineModel.callEyeMap(false)
LineModel.callEyeMap(6)
}
}
LineModel.arrivedStationSuccess()

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/NormalRepository.kt
View File

@@ -124,7 +124,7 @@ class NormalRepository: ILineRepository {
if (LineModel.startStationIndex < stationlist.size-1) {
val endStation = stationlist[LineModel.startStationIndex + 1]
LineManager.setStartAndEndStation(startStation,endStation)
LineModel.callEyeMap(false)
LineModel.callEyeMap(7)
}
}
return@flatMap Observable.just(true)

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt
View File

@@ -100,7 +100,7 @@ class WeaknetRepository : ILineRepository {
if (LineModel.startStationIndex < stationlist.size-1) {
val endStation = stationlist[LineModel.startStationIndex + 1]
LineManager.setStartAndEndStation(startStation,endStation)
LineModel.callEyeMap(false)
LineModel.callEyeMap(8)
}
}