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

[8.5.0]

Browse Source 
[16s拦截去掉]
This commit is contained in:
yangyakun
2026-03-19 19:11:07 +08:00
parent 7589b4a0fd
commit 957c9aa924
16 changed files with 48 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/line/LineManager.kt
View File

@@ -638,12 +638,6 @@ object LineManager : CallerBase<ILineCallback>() {
return
}
}
/**
* 存在Session
*/
if (!OchAutoPilotManager.canStartAutopilotBySessionId()) {
return
}
OchAutopilotAnalytics.triggerClickStartAutopilotTime(System.currentTimeMillis())
//1、判断轨迹url是否可用
if (_contraiInfo == null) {

11
OCH/common/data/src/main/java/com/mogo/och/data/bean/BusStationBean.kt
View File

@@ -11,6 +11,17 @@ import java.util.Objects
* @author tongchenfei
*/
open class BusStationBean {
companion object{
const val drivingStatusInit = 0//0初始值
const val drivingStatusPassed = 1//1已经过
const val drivingStatusCurrent = 2//2当前站
const val drivingStatusNotArrived = 3//3未到站
const val tagInit = 0//0初始值
const val tagNormal = 1//1正常停靠
const val tagSkip = 2//2 需要跳过
}
var siteId: Int = 0
@JvmField

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

@@ -103,7 +103,7 @@ class BusRoutesResponse : BaseData() {
}
result.add(temp!!)
// 正在进行中的任务
if (temp!!.drivingStatus == TaskSiteDataBean.drivingStatusCurrent) {
if (temp!!.drivingStatus == BusStationBean.drivingStatusCurrent) {
if (temp!!.tag != 2) {
currentStationIndex = index
}

2
OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/model/LineModel.kt
View File

@@ -334,7 +334,7 @@ object LineModel {
fun startTaskMessage(): Boolean {
if (!stationList.isNullOrEmpty()) {
return startStationIndex == 0 && stationList!!.first().drivingStatus == TaskSiteDataBean.drivingStatusCurrent && !stationList!!.first().isLeaving
return startStationIndex == 0 && stationList!!.first().drivingStatus == BusStationBean.drivingStatusCurrent && !stationList!!.first().isLeaving
}
return false
}

9
OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/model/OrderModel.kt
View File

@@ -40,6 +40,7 @@ import com.mogo.och.common.module.utils.DateTimeUtil
import com.mogo.och.common.module.utils.OCHThreadPoolManager
import com.mogo.och.common.module.utils.ResourcesUtils
import com.mogo.och.common.module.utils.RxUtils
import com.mogo.och.data.bean.BusStationBean
import com.mogo.och.shuttle.unmanned.R
import com.mogo.och.unmanned.constant.BusConst
import com.mogo.och.unmanned.repository.RepositoryManager
@@ -320,7 +321,7 @@ object OrderModel {
}
LineManager.getStations().first?.let { startStation ->
startStation.drivingStatus = TaskSiteDataBean.drivingStatusCurrent
startStation.drivingStatus = BusStationBean.drivingStatusCurrent
startStation.isLeaving = true
LineModel.currentTask?.let { task ->
RepositoryManager.leaveStation(
@@ -506,9 +507,9 @@ object OrderModel {
LineManager.lastArrivedSiteId = end.siteId
isArrivedStation = true
isGoingToNextStation = false
start.drivingStatus = TaskSiteDataBean.drivingStatusPassed
start.drivingStatus = BusStationBean.drivingStatusPassed
start.isLeaving = false
end.drivingStatus = TaskSiteDataBean.drivingStatusCurrent
end.drivingStatus = BusStationBean.drivingStatusCurrent
RepositoryManager.arriveStation(end.seq, end.siteId.toLong(), LineModel.currentTask?.taskId
?: 0L)
?.subscribeOn(Schedulers.io())
@@ -592,7 +593,7 @@ object OrderModel {
OchChainLogManager.writeChainLog("触发跳站", "点击")
end.tag = 2
end.drivingStatus = TaskSiteDataBean.drivingStatusNotArrived
end.drivingStatus = BusStationBean.drivingStatusNotArrived
RepositoryManager.skipStation()
?.subscribeOn(Schedulers.io())
?.observeOn(AndroidSchedulers.mainThread())

15
OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/repository/db/bean/TaskSiteDataBean.kt
View File

@@ -3,6 +3,7 @@ package com.mogo.och.unmanned.repository.db.bean
import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.PrimaryKey
import com.mogo.och.data.bean.BusStationBean
@Entity(tableName = TaskSiteDataBean.tableName)
data class TaskSiteDataBean(
@@ -158,9 +159,9 @@ data class TaskSiteDataBean(
temp?.lon = it.lon
temp?.lat = it.lat
if (it.seq == 1) {
temp?.drivingStatus = drivingStatusCurrent
temp?.drivingStatus = BusStationBean.drivingStatusCurrent
} else {
temp?.drivingStatus = drivingStatusNotArrived
temp?.drivingStatus = BusStationBean.drivingStatusNotArrived
}
temp?.leaving = false
temp?.introduction = it.introduction
@@ -174,15 +175,5 @@ data class TaskSiteDataBean(
const val tableName: String = "used_task_data_table"
const val drivingStatusInit = 0//0初始值
const val drivingStatusPassed = 1//1已经过
const val drivingStatusCurrent = 2//2当前站
const val drivingStatusNotArrived = 3//3未到站
const val tagInit = 0//0初始值
const val tagNormal = 1//1正常停靠
const val tagSkip = 2//2 需要跳过
}
}

7
OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/repository/db/repository/TaskSiteDb.kt
View File

@@ -4,6 +4,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_
import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
import com.mogo.och.common.module.manager.loop.BizLoopManager
import com.mogo.och.data.bean.BusStationBean
import com.mogo.och.data.db.exception.DbException
import com.mogo.och.shuttle.unmanned.R
import com.mogo.och.unmanned.repository.db.IDbRepository
@@ -168,7 +169,7 @@ object TaskSiteDb : IDbRepository {
runningSite.forEach {
if (it.siteId == currentSiteId) {
currentSeq = it.seq ?: 0
it.drivingStatus = TaskSiteDataBean.drivingStatusCurrent
it.drivingStatus = BusStationBean.drivingStatusCurrent
it.leaving = leaving
return@forEach
}
@@ -176,10 +177,10 @@ object TaskSiteDb : IDbRepository {
runningSite.forEach {
val seq = it.seq ?: 0
if (seq < currentSeq) {
it.drivingStatus = TaskSiteDataBean.drivingStatusPassed
it.drivingStatus = BusStationBean.drivingStatusPassed
it.leaving = true
} else if (seq > currentSeq) {
it.drivingStatus = TaskSiteDataBean.drivingStatusNotArrived
it.drivingStatus = BusStationBean.drivingStatusNotArrived
it.leaving = false
}
}

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

@@ -103,7 +103,7 @@ class NormalRepository : ILineRepository {
temp?.siteId = taskAndsite.siteId
result.add(temp!!)
// 正在进行中的任务
if (temp!!.drivingStatus == TaskSiteDataBean.drivingStatusCurrent) {
if (temp!!.drivingStatus == BusStationBean.drivingStatusCurrent) {
if (temp!!.tag != 2) {
currentStationIndex = index
}

9
OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/repository/line/impl/WeaknetRepository.kt
View File

@@ -16,6 +16,7 @@ import com.mogo.och.common.module.biz.login.LoginStatusManager
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
import com.mogo.och.common.module.network.OchCommonServiceCallback
import com.mogo.och.common.module.utils.DateTimeUtil
import com.mogo.och.data.bean.BusStationBean
import com.mogo.och.data.bean.ContraiInfo
import com.mogo.och.shuttle.unmanned.R
import com.mogo.och.unmanned.bean.request.QueryPointRequest
@@ -424,7 +425,7 @@ class WeaknetRepository : ILineRepository {
TaskSiteDb.updateDrivingStatusAndLeave(
task.taskId!!,
start.siteId.toLong(),
TaskSiteDataBean.drivingStatusPassed,
BusStationBean.drivingStatusPassed,
false
)
// 设置到站任务
@@ -455,7 +456,7 @@ class WeaknetRepository : ILineRepository {
TaskSiteDb.updateDrivingStatus(
taskId,
end.siteId.toLong(),
TaskSiteDataBean.drivingStatusCurrent
BusStationBean.drivingStatusCurrent
)
}
} else {
@@ -487,9 +488,9 @@ class WeaknetRepository : ILineRepository {
TaskSiteDb.updateDrivingStatusTagAndLeave(
task.taskId!!,
end.siteId.toLong(),
TaskSiteDataBean.drivingStatusNotArrived,
BusStationBean.drivingStatusNotArrived,
false,
TaskSiteDataBean.tagSkip
BusStationBean.tagSkip
)
}
}

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

@@ -95,7 +95,7 @@ class BusRoutesResponse : BaseData() {
}
result.add(temp!!)
// 正在进行中的任务
if (temp!!.drivingStatus == TaskSiteDataBean.drivingStatusCurrent) {
if (temp!!.drivingStatus == BusStationBean.drivingStatusCurrent) {
if (temp!!.tag != 2) {
currentStationIndex = index
}

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

@@ -324,7 +324,7 @@ object LineModel {
fun startTaskMessage():Boolean {
if (!stationList.isNullOrEmpty()) {
return startStationIndex == 0 && stationList!!.first().drivingStatus == TaskSiteDataBean.drivingStatusCurrent && !stationList!!.first().isLeaving
return startStationIndex == 0 && stationList!!.first().drivingStatus == BusStationBean.drivingStatusCurrent && !stationList!!.first().isLeaving
}
return false
}

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

@@ -40,9 +40,9 @@ import com.mogo.och.common.module.utils.DateTimeUtil
import com.mogo.och.common.module.utils.OCHThreadPoolManager
import com.mogo.och.common.module.utils.ResourcesUtils
import com.mogo.och.common.module.utils.RxUtils
import com.mogo.och.data.bean.BusStationBean
import com.mogo.och.shuttle.weaknet.R
import com.mogo.och.weaknet.constant.BusConst
import com.mogo.och.weaknet.repository.db.bean.TaskSiteDataBean
import com.mogo.och.weaknet.repository.RepositoryManager
import com.mogo.och.weaknet.repository.exception.DataException
import com.mogo.och.weaknet.util.BusTrajectoryManager
@@ -285,7 +285,7 @@ object OrderModel {
}
LineManager.getStations().first?.let {startStation->
startStation.drivingStatus = TaskSiteDataBean.drivingStatusCurrent
startStation.drivingStatus = BusStationBean.drivingStatusCurrent
startStation.isLeaving = true
LineModel.currentTask?.let { task->
RepositoryManager.leaveStation(
@@ -472,9 +472,9 @@ object OrderModel {
LineManager.lastArrivedSiteId = end.siteId
isArrivedStation = true
isGoingToNextStation = false
start.drivingStatus = TaskSiteDataBean.drivingStatusPassed
start.drivingStatus = BusStationBean.drivingStatusPassed
start.isLeaving = false
end.drivingStatus = TaskSiteDataBean.drivingStatusCurrent
end.drivingStatus = BusStationBean.drivingStatusCurrent
RepositoryManager.arriveStation(end.seq,end.siteId.toLong(), LineModel.currentTask?.taskId?:0L)
?.subscribeOn(Schedulers.io())
?.observeOn(AndroidSchedulers.mainThread())

10
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/TaskSiteDataBean.kt
View File

@@ -3,7 +3,7 @@ package com.mogo.och.weaknet.repository.db.bean
import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.PrimaryKey
import com.mogo.och.weaknet.repository.db.bean.SiteDataBean
import com.mogo.och.data.bean.BusStationBean
@Entity(tableName = TaskSiteDataBean.tableName)
data class TaskSiteDataBean(
@@ -159,9 +159,9 @@ data class TaskSiteDataBean(
temp?.lon = it.lon
temp?.lat = it.lat
if(it.seq==1){
temp?.drivingStatus = drivingStatusCurrent
temp?.drivingStatus = BusStationBean.drivingStatusCurrent
}else{
temp?.drivingStatus = drivingStatusNotArrived
temp?.drivingStatus = BusStationBean.drivingStatusNotArrived
}
temp?.leaving = false
temp?.introduction = it.introduction
@@ -175,9 +175,5 @@ data class TaskSiteDataBean(
const val tableName: String = "used_task_data_table"
const val drivingStatusInit = 0//0初始值
const val drivingStatusPassed = 1//1已经过
const val drivingStatusCurrent = 2//2当前站
const val drivingStatusNotArrived = 3//3未到站
}
}

7
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskSiteDb.kt
View File

@@ -5,6 +5,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_
import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
import com.mogo.och.common.module.manager.loop.BizLoopManager
import com.mogo.och.data.bean.BusStationBean
import com.mogo.och.weaknet.repository.db.IDbRepository
import com.mogo.och.weaknet.repository.db.MyDataBase
import com.mogo.och.weaknet.repository.db.bean.TaskSiteDataBean
@@ -152,7 +153,7 @@ object TaskSiteDb : IDbRepository {
runningSite.forEach {
if (it.siteId == currentSiteId) {
currentSeq = it.seq ?: 0
it.drivingStatus = TaskSiteDataBean.drivingStatusCurrent
it.drivingStatus = BusStationBean.drivingStatusCurrent
it.leaving = leaving
return@forEach
}
@@ -160,10 +161,10 @@ object TaskSiteDb : IDbRepository {
runningSite.forEach {
val seq = it.seq ?: 0
if (seq < currentSeq) {
it.drivingStatus = TaskSiteDataBean.drivingStatusPassed
it.drivingStatus = BusStationBean.drivingStatusPassed
it.leaving = true
} else if (seq > currentSeq) {
it.drivingStatus = TaskSiteDataBean.drivingStatusNotArrived
it.drivingStatus = BusStationBean.drivingStatusNotArrived
it.leaving = false
}
}

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

@@ -100,7 +100,7 @@ class NormalRepository: ILineRepository {
temp?.siteId = taskAndsite.siteId
result.add(temp!!)
// 正在进行中的任务
if (temp!!.drivingStatus == TaskSiteDataBean.drivingStatusCurrent) {
if (temp!!.drivingStatus == BusStationBean.drivingStatusCurrent) {
if (temp!!.tag != 2) {
currentStationIndex = index
}

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

@@ -16,6 +16,7 @@ import com.mogo.och.common.module.biz.login.LoginStatusManager
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
import com.mogo.och.common.module.network.OchCommonServiceCallback
import com.mogo.och.common.module.utils.DateTimeUtil
import com.mogo.och.data.bean.BusStationBean
import com.mogo.och.data.bean.ContraiInfo
import com.mogo.och.shuttle.weaknet.R
import com.mogo.och.weaknet.bean.request.QueryPointRequest
@@ -420,7 +421,7 @@ class WeaknetRepository : ILineRepository {
TaskSiteDb.updateDrivingStatusAndLeave(
task.taskId!!,
start.siteId.toLong(),
TaskSiteDataBean.drivingStatusPassed,
BusStationBean.drivingStatusPassed,
false
)
// 设置到站任务
@@ -451,7 +452,7 @@ class WeaknetRepository : ILineRepository {
TaskSiteDb.updateDrivingStatus(
taskId,
end.siteId.toLong(),
TaskSiteDataBean.drivingStatusCurrent
BusStationBean.drivingStatusCurrent
)
}
} else {