From 272b97f44395004fb40a2c04c289fc0c16264444 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Tue, 2 Sep 2025 16:34:48 +0800 Subject: [PATCH] =?UTF-8?q?[8.2.0][fix]=E6=95=B0=E7=BB=84=E8=B6=8A?= =?UTF-8?q?=E7=95=8C=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/och/weaknet/model/SynchDataModel.kt | 1 + .../com/mogo/och/weaknet/repository/db/repository/PointDb.kt | 3 +++ 2 files changed, 4 insertions(+) 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 fd48439a9a..2818e52bf7 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 @@ -180,6 +180,7 @@ object SynchDataModel { OchChainLogManager.writeChainLogNet(false,"同步轨迹","网络请求重构 轨迹信息${data}") d(TAG, "同步轨迹网络成功") }catch (e:Exception){ + isRequestingContrainInfo.set(false) OchChainLogManager.writeChainLogDb("同步轨迹","同步轨迹时报错 轨迹信息${data} 错误信息${e.message}") synContraiInfo(needUpdatePoint) } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/PointDb.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/PointDb.kt index 8b6b596bfe..8382701e01 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/PointDb.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/PointDb.kt @@ -41,6 +41,7 @@ object PointDb: IDbRepository { serverDataList.forEach { contrailInfo -> val lineId = contrailInfo.lineId + // 当前线路已排序的所有站点 val siteList = SiteDb.querySiteByLineId(lineId) val contraiBean = ContraiDb.queryAutopilotInfoByLineid(lineId) @@ -57,6 +58,8 @@ object PointDb: IDbRepository { siteList?.let { siteListTemp-> siteIndex?.let {siteIndexTemp-> // 途径点和禁行点所有站点 + // TODO:("站点接口和轨迹接口绑定有问题的情况未来要处理") + if (siteIndexTemp < 0 || siteIndexTemp >= siteListTemp.size) return@forEachIndexed val siteDataBean = siteListTemp[siteIndexTemp] segmentPoint.pointList?.forEachIndexed { index, point -> val pointTemp = PointDataBean()