From cfc9a304f61a20ab487ebd53afc914dd2cf84c0e Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 27 Dec 2024 16:58:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[6.9.0]=20[fix]=20[offline]=20[=E7=A9=BAche?= =?UTF-8?q?ck]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/offline/model/OrderModel.java | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java index 71e06fb8c9..950a5b1a6c 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java @@ -757,7 +757,28 @@ public class OrderModel { */ private void updateBusStatus(BusRoutesResult result) { if (result == null) return; - LineManager.INSTANCE.setContraiInfo(new ContraiInfo(result.getLineId(),result.csvFileUrl,result.csvFileMd5,result.txtFileUrl,result.txtFileMd5,result.contrailSaveTime,null,null,1)); + if(result.csvFileUrl==null){ + result.csvFileUrl = ""; + } + if(result.csvFileMd5==null){ + result.csvFileMd5 = ""; + } + if(result.txtFileUrl==null){ + result.txtFileUrl = ""; + } + if(result.txtFileMd5==null){ + result.txtFileMd5 = ""; + } + LineManager.INSTANCE.setContraiInfo(new ContraiInfo( + result.getLineId(), + result.csvFileUrl, + result.csvFileMd5, + result.txtFileUrl, + result.txtFileMd5, + result.contrailSaveTime, + null, + null, + 1)); busRoutesResult = result; stationList.clear(); stationList.addAll(result.getSites()); From dc269797481ad05bce2524d193ef6cb79e562314 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 27 Dec 2024 17:38:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[6.9.0]=20[fix]=20[offline]=20[=E7=A9=BAche?= =?UTF-8?q?ck]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/offline/model/OrderModel.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java index 950a5b1a6c..6f1149f754 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java @@ -1140,16 +1140,18 @@ public class OrderModel { } public void setTrajectoryStation(BusStationBean startStation, BusStationBean endStation, Long lineId) { - LineManager.INSTANCE.setStartAndEndStation(startStation,endStation); - - MogoLocation startStationMogoLocation = new MogoLocation(); - startStationMogoLocation.setLongitude(startStation.getGcjLon()); - startStationMogoLocation.setLatitude(startStation.getGcjLat()); - MogoLocation endStationMogoLocation = new MogoLocation(); - endStationMogoLocation.setLongitude(endStation.getGcjLon()); - endStationMogoLocation.setLatitude(endStation.getGcjLat()); - TrajectoryAndDistanceManager.INSTANCE.setStationPoint(startStationMogoLocation, endStationMogoLocation, lineId); + if(startStation==null||endStation==null){ + TrajectoryAndDistanceManager.INSTANCE.setStationPoint(null, null, lineId); + }else { + MogoLocation startStationMogoLocation = new MogoLocation(); + startStationMogoLocation.setLongitude(startStation.getGcjLon()); + startStationMogoLocation.setLatitude(startStation.getGcjLat()); + MogoLocation endStationMogoLocation = new MogoLocation(); + endStationMogoLocation.setLongitude(endStation.getGcjLon()); + endStationMogoLocation.setLatitude(endStation.getGcjLat()); + TrajectoryAndDistanceManager.INSTANCE.setStationPoint(startStationMogoLocation, endStationMogoLocation, lineId); + } } }