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

[8.2.0][opt]修改站点导致途经点顺序与其不匹配

Browse Source
This commit is contained in:
chenfufeng
2025-08-30 16:41:08 +08:00
parent 1aee07650f
commit bab3284ad6
3 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@ import com.mogo.commons.AbsMogoApplication
import com.mogo.commons.storage.SharedPrefsMgr
import com.mogo.eagle.core.network.utils.digest.DigestUtils
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i
import com.mogo.eagle.core.utilcode.util.NetworkUtils
import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
@@ -54,7 +55,7 @@ object SynchDataModel {
object : OchCommonServiceCallback<CarExecutableTaskResponse> {
override fun onSuccess(data: CarExecutableTaskResponse) {
isRequesting.set(false)
d(TAG,"同步数据成功")
i(TAG,"查询路线和站点的数据为:${data.data}")
RxUtils.disposeSubscribe(queryCarInfo)
queryCarInfo = RxUtils.createSubscribe(60_000) {
queryCarExecutableTaskList(true)
@@ -130,9 +131,8 @@ object SynchDataModel {
private val isRequestingContrainInfo = AtomicBoolean(false)
fun synContraiInfo(needUpdatePoint: MutableList<Long>) {
waitSysData.addAll(needUpdatePoint)
fun synContraiInfo(needUpdatePoint: MutableList<Long>, updateAll: Boolean = false) {
if (!updateAll) waitSysData.addAll(needUpdatePoint)
if(isRequestingContrainInfo.get()){
// 正在请求
OchChainLogManager.writeChainLogNet(false,"同步轨迹","正在同步轨迹请稍等 ")
@@ -141,8 +141,12 @@ object SynchDataModel {
isRequestingContrainInfo.set(true)
val lines = mutableListOf<Long>()
waitSysData.forEach {
lines.add(it)
if (updateAll) {
lines.addAll(needUpdatePoint)
} else {
waitSysData.forEach {
lines.add(it)
}
}
OchChainLogManager.writeChainLogNet(false,"同步轨迹","轨迹变更需同步禁行点和途径点 线路：${lines}")
RepositoryManager.queryPointFromNet(lines)
@@ -168,13 +172,18 @@ object SynchDataModel {
override fun onNext(data: List<PointResponse>) {
try {
i(TAG, "途经点和轨迹信息为:${data}")
PointDb.addOrUpdate(data)
for (datum in data) {
waitSysData.remove(datum.lineId)
if (!updateAll) {
for (datum in data) {
waitSysData.remove(datum.lineId)
}
}
isRequestingContrainInfo.set(false)
if(waitSysData.isNotEmpty()){
synContraiInfo(needUpdatePoint)
if (!updateAll) {
if(waitSysData.isNotEmpty()){
synContraiInfo(needUpdatePoint)
}
}
OchChainLogManager.writeChainLogNet(false,"同步轨迹","网络请求重构 轨迹信息${data}")
d(TAG, "同步轨迹网络成功")

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

@@ -108,7 +108,7 @@ object SiteDb: IDbRepository {
if (delPointByLineIds.isNotEmpty()) {
val delPointList = delPointByLineIds.toMutableList()
PointDb.deletePointByLineIds(delPointList)
SynchDataModel.synContraiInfo(delPointList)
SynchDataModel.synContraiInfo(delPointList, true)
}
checkData()
}

3
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusTrajectoryManager.kt
View File

@@ -3,6 +3,7 @@ package com.mogo.och.weaknet.util
import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS
import com.mogo.eagle.core.utilcode.util.GsonUtils
@@ -162,7 +163,7 @@ object BusTrajectoryManager : ITrajectoryListListener {
CallerAutoPilotControlManager.sendTrajectoryDownloadReq(it, 0)
}
d(TAG, "sendTrajectoryReq(): " + GsonUtils.toJson(mAutopilotControlParameters))
i(TAG, "sendTrajectoryReq(): " + GsonUtils.toJson(mAutopilotControlParameters))
}
}