From a537dee56ab282a82047802ce2b535a7650761e8 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 15 Oct 2024 13:57:29 +0800
Subject: [PATCH] =?UTF-8?q?[6.7.0]=20[fix]=20[=E6=B7=BB=E5=8A=A0mark=20?=
 =?UTF-8?q?=E5=BC=82=E6=AD=A5=E9=97=AE=E9=A2=98]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/weaknet/model/LineModel.kt   |  4 ----
 .../com/mogo/och/weaknet/model/OrderModel.kt  | 19 +++++--------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt
index ad1efeea92..848cd531f3 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt
@@ -249,10 +249,6 @@ object LineModel {
         }
     }
 
-    // 到站
-    fun arrivedStation() {
-
-    }
     fun arrivedStationSuccess(){
         mBusLinesCallbackMap.forEach {callback->
             callback.value.onArriveStationSuccess()
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt
index 91d02508ef..429d4d6b2e 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt
@@ -267,11 +267,15 @@ object OrderModel {
      * 渲染站点信息
      * 服务端返回的OchBusRoutesResult逻辑， 离开站为当前站， 到达下一站后才会将下一站置为当前站，
      * 车机端展示 三站： 中间为即将到到达或者刚到达的站
+     * queryBusRoutes
+     * queryBusRoutes
+     * queryBusRoutes
+     * driveToNextStation
+     * onArriveAt
      */
     private fun updateBusStatus() {
         val (startStation, endStation) = LineManager.getStations()
         if(startStation!=null&&endStation!=null){
-            MapMakerManager.removeAllMapMarkerByOwner(TAG)
             if(startStation.isLeaving){// 出发需要移除
                 MapMakerManager.removeMapMaker(BusConst.BUS_START_MAP_MAKER,startStation.lat,startStation.lon)
             }else{// 为出发展示
@@ -378,19 +382,6 @@ object OrderModel {
         //MAP 280 每隔100ms左右返回一次到站， 导致在到达中间站后再次滑动出发后会有时间差，收到一次到站，出现问题
         //此处比对 自驾告诉的到站站点坐标和本地应到站站点坐标， 一致时才能到站
         LineManager.getStations { start, end ->
-            if (data != null && data.endLocation != null) {
-                val latitude = NumberFormatUtil.cutOutNumber(data.endLocation.latitude, 5) //wgs
-                val longitude = NumberFormatUtil.cutOutNumber(data.endLocation.longitude, 5)
-
-                val arriveLat = NumberFormatUtil.cutOutNumber(end.lat, 5)
-                val arriveLon = NumberFormatUtil.cutOutNumber(end.lon, 5)
-
-                if (latitude != arriveLat || longitude != arriveLon) {
-                    e(M_BUS + TAG, "行程日志-到站拦截,到站坐标不一致")
-                    OchChainLogManager.writeChainLog("shuttle弱网","$type 行程日志-到站拦截,到站坐标不一致")
-                    return@getStations
-                }
-            }
 
             if (isArrivedStation) return@getStations