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

[6.8.0]

Browse Source 
[fea]
[event 上报删除分页 并根据businessTime 排序]
This commit is contained in:
yangyakun
2024-11-28 17:36:05 +08:00
parent 6e826f3446
commit e4e632f9aa
7 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
View File

@@ -744,7 +744,7 @@ class DriverM1Model {
if (it == null || it < 0) {
LineManager.setLineInfo(null)
} else {
LineManager.setLineInfo(LineInfo(it.toLong(),mCurrentOrder?.lineName?:""))
LineManager.setLineInfo(LineInfo(it.toLong(),mCurrentOrder?.lineName?:"", orderId = data.data.orderNo))
}
}

2
OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/line/LineManager.kt
View File

@@ -320,7 +320,7 @@ object LineManager : CallerBase<ILineCallback>() {
parameters?.startLatLon = AutoPilotLonLat(start.lat, start.lon)
parameters?.endLatLon = AutoPilotLonLat(end.lat, end.lon)
parameters?.vehicleType = 10
this.autopilotId = "${lineInfo.lineId}_${start.siteId}_${end.siteId}"
this.autopilotId = "${lineInfo.lineId}_${start.siteId}_${end.siteId}_${lineInfo.orderId}"
parameters?.orderId = this.autopilotId
parameters?.firstAutopilotFlag = isFirstStartAutopilot

4
OCH/common/data/src/main/java/com/mogo/och/data/bean/LineInfo.kt
View File

@@ -14,6 +14,8 @@ data class LineInfo(
/**
* 附加信息
*/
var multiMap: MutableMap<String,String>? = mutableMapOf()
var multiMap: MutableMap<String,String>? = mutableMapOf(),
val orderId:String?=null
)

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/BusRoutesResponse.kt
View File

@@ -72,7 +72,7 @@ class BusRoutesResponse : BaseData() {
}
// 线路信息
if (lineInfo == null && taskAndsite.lineId != null && taskAndsite.lineName != null) {
lineInfo = LineInfo(taskAndsite.lineId!!, taskAndsite.lineName!!)
lineInfo = LineInfo(taskAndsite.lineId!!, taskAndsite.lineName!!, orderId = taskAndsite.taskId.toString())
}
lineInfo?.multiMap?.put("taskInfo",LineModel.getTaskTime())
}

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

@@ -97,7 +97,7 @@ class NormalRepository: ILineRepository {
}
// 线路信息
if (lineInfo == null && busRoutesResult.name != null) {
lineInfo = LineInfo(busRoutesResult.lineId.toLong(), busRoutesResult.name)
lineInfo = LineInfo(busRoutesResult.lineId.toLong(), busRoutesResult.name, orderId = busRoutesResult.taskId.toString() )
}
lineInfo?.multiMap?.put("taskInfo", LineModel.getTaskTime())
}

2
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingselect/RoutingSelectModel.kt
View File

@@ -152,7 +152,7 @@ class RoutingSelectModel : ViewModel() {
}
DebugView.printInfoMsg("[启自驾] 准备启动自驾")
LineManager.setLineInfo(LineInfo(grayLineBean.lineId?:0L,grayLineBean.lineName?:""))
LineManager.setLineInfo(LineInfo(grayLineBean.lineId?:0L,grayLineBean.lineName?:"", orderId = "${data.taskId}"))
LineManager.setContraiInfo(contrailBean.toContraiInfo())
LineManager.setStartAndEndStation(grayLineBean.startSite?.toBusStationBean(),grayLineBean.endSite?.toBusStationBean())

2
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt
View File

@@ -1100,7 +1100,7 @@ object TaxiTaskModel {
mTaskTrajectoryList.addAll(it)
mCurrentTaskTrajectory = it.first { currentTaskLineId == it.lineId }
mCurrentTaskTrajectory?.let {traj->
LineManager.setLineInfo(LineInfo(traj.lineId,traj.lineName))
LineManager.setLineInfo(LineInfo(traj.lineId,traj.lineName, orderId = mCurrentTaskWithOrder?.order?.orderNo?:""))
LineManager.setContraiInfo(traj.toCommonContraiInfo())
}
}