diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/SynchDataModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/SynchDataModel.kt index 325327b53a..b22524b96b 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/SynchDataModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/SynchDataModel.kt @@ -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 { 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) { - - waitSysData.addAll(needUpdatePoint) + fun synContraiInfo(needUpdatePoint: MutableList, 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() - 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) { 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, "同步轨迹网络成功") diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/SiteDb.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/SiteDb.kt index ab3091b5b3..4d7d59dd2a 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/SiteDb.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/SiteDb.kt @@ -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() } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusTrajectoryManager.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusTrajectoryManager.kt index 07510a562c..e34733eb2d 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusTrajectoryManager.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusTrajectoryManager.kt @@ -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)) } }