From 1d885d1503fd680a66fd216aab72e30e4bb0e258 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 29 Nov 2024 11:11:40 +0800
Subject: [PATCH] =?UTF-8?q?[6.8.0]=20[fix]=20[=E7=AB=99=E7=82=B9=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mogo/och/weaknet/model/LineModel.kt    | 9 +++++----
 .../main/java/com/mogo/och/weaknet/model/OrderModel.kt   | 7 +++++--
 .../och/weaknet/repository/line/impl/NormalRepository.kt | 2 +-
 .../weaknet/repository/line/impl/WeaknetRepository.kt    | 2 +-
 4 files changed, 12 insertions(+), 8 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 3d5e81c63c..eb92bb91d1 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
@@ -346,7 +346,7 @@ object LineModel {
                                 LineManager.setLineInfo(null)
                                 LineManager.setStartAndEndStation(null, null)
                                 LanSocketManager.sendMsgToClient(WriteOffResultMsg(-99, "","", System.currentTimeMillis(),LineManager.lineInfos?.lineId?:0,LineManager.getStations()?.first?.siteId?.toLong()?:0L))
-                                LineModel.callEyeMap(true)
+                                LineModel.callEyeMap(1)
                                 stationList = mutableListOf()
                                 startStationIndex = 0
                                 mBusLinesCallbackMap.forEach {
@@ -381,9 +381,9 @@ object LineModel {
                                 LineManager.setLineInfo(null)
                                 LineManager.setStartAndEndStation(null, null)
                                 LanSocketManager.sendMsgToClient(WriteOffResultMsg(-99, "","", System.currentTimeMillis(),LineManager.lineInfos?.lineId?:0,LineManager.getStations()?.first?.siteId?.toLong()?:0L))
-                                LineModel.callEyeMap(true)
                                 stationList = mutableListOf()
                                 startStationIndex = 0
+                                LineModel.callEyeMap(2)
                                 mBusLinesCallbackMap.forEach {
                                     it.value.onCompleteTask()
                                 }
@@ -426,8 +426,9 @@ object LineModel {
         }
     }
 
-    fun callEyeMap(isClear:Boolean){
-        if(isClear) {
+    fun callEyeMap(index:Int){
+        CallerLogger.d(TAG,"执行${index} callEyeMap${stationList?.size}")
+        if(stationList.isNullOrEmpty()){
             val ochInfo = OchInfo(1, mutableListOf())
             ochInfo.siteMarkerList = mutableListOf()
             OchChainLogManager.writeChainLog("地图","站点信息:${ochInfo}")
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 13eb90673a..c04163792f 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
@@ -294,6 +294,8 @@ object OrderModel {
                             ThirdDeviceData.leaveStation()
 
                             updateBusStatus()
+
+                            LineModel.callEyeMap(3)
                         }
 
                         override fun onComplete() {
@@ -309,6 +311,7 @@ object OrderModel {
                                 ThirdDeviceData.leaveStation()
 
                                 updateBusStatus()
+                                LineModel.callEyeMap(4)
                             }
                         }
                     })
@@ -468,7 +471,7 @@ object OrderModel {
                                 if(LineModel.startStationIndex +1< it.size){
                                     val endStation = it[LineModel.startStationIndex +1]
                                     LineManager.setStartAndEndStation(startStation,endStation)
-                                    LineModel.callEyeMap(false)
+                                    LineModel.callEyeMap(5)
                                 }
                             }
                             LineModel.arrivedStationSuccess()
@@ -484,7 +487,7 @@ object OrderModel {
                                 if(LineModel.startStationIndex +1< it.size){
                                     val endStation = it[LineModel.startStationIndex +1]
                                     LineManager.setStartAndEndStation(startStation,endStation)
-                                    LineModel.callEyeMap(false)
+                                    LineModel.callEyeMap(6)
                                 }
                             }
                             LineModel.arrivedStationSuccess()
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/NormalRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/NormalRepository.kt
index 9088acf1cf..627b6f9352 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/NormalRepository.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/NormalRepository.kt
@@ -124,7 +124,7 @@ class NormalRepository: ILineRepository {
                         if (LineModel.startStationIndex < stationlist.size-1) {
                             val endStation = stationlist[LineModel.startStationIndex + 1]
                             LineManager.setStartAndEndStation(startStation,endStation)
-                            LineModel.callEyeMap(false)
+                            LineModel.callEyeMap(7)
                         }
                     }
                     return@flatMap Observable.just(true)
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt
index 30030990f7..17b34e042d 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt
@@ -100,7 +100,7 @@ class WeaknetRepository : ILineRepository {
                             if (LineModel.startStationIndex < stationlist.size-1) {
                                 val endStation = stationlist[LineModel.startStationIndex + 1]
                                 LineManager.setStartAndEndStation(startStation,endStation)
-                                LineModel.callEyeMap(false)
+                                LineModel.callEyeMap(8)
                             }
                         }