From 7e6ddbafb8bee80878b05d29978c798af5271304 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 25 Oct 2024 14:27:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[6.7.0]=20[fix]=20[=E6=AD=A3=E5=9C=A8?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E7=9B=B4=E6=8E=A5=E8=BF=94=E5=9B=9E=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mogo/och/weaknet/model/LineModel.kt    | 5 +++++
 1 file changed, 5 insertions(+)

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 848cd531f3..490cc09bc3 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
@@ -106,6 +106,11 @@ object LineModel {
      */
     private fun queryCarExecutableTaskList(isBackground:Boolean) {
         if(isRequesting.get()){
+            CallerLogger.d(TAG,"正在同步请稍等")
+            val lastUpdateTime = SharedPrefsMgr.getInstance().getLong(EXECUTABLECHANGETIME, 0)
+            mBusLinesCallbackMap.forEach { callback ->
+                callback.value.onRefreshSuccess(lastUpdateTime)
+            }
             return
         }
         isRequesting.set(true)

From 76d1ec93b573153361e370bcc922f3d7021ead61 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 25 Oct 2024 17:29:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[6.7.2]=20[fea]=20[=E6=BB=91=E5=8A=A8?=
 =?UTF-8?q?=E5=87=BA=E5=8F=91=E5=92=8C=E5=88=B0=E7=AB=99=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=BC=BA=E5=88=B6=E6=B5=81=E8=BD=AC]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/weaknet/model/LineModel.kt   |  1 +
 .../com/mogo/och/weaknet/model/OrderModel.kt  | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

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 490cc09bc3..7de6227584 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
@@ -7,6 +7,7 @@ import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.network.utils.digest.DigestUtils
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS
 import com.mogo.eagle.core.utilcode.util.NetworkUtils
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 f83b7d01a5..3fc675e3c2 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
@@ -240,6 +240,13 @@ object OrderModel {
                             if (e is DataException) {
 
                             }
+                            LineModel.leaveStationSuccess()
+                            isArrivedStation = false
+                            onStartAutopilot()
+
+                            ThirdDeviceData.leaveStation()
+
+                            updateBusStatus()
                         }
 
                         override fun onComplete() {
@@ -406,6 +413,18 @@ object OrderModel {
                             if (e is DataException) {
 
                             }
+                            ThirdDeviceData.arriveStation()
+                            d(TAG, "arrivedStation onComplete")
+                            LineModel.stationList?.let {
+                                LineModel.startStationIndex +=1
+                                val startStation = LineManager.getStations().second
+                                if(LineModel.startStationIndex +1< it.size){
+                                    val endStation = it[LineModel.startStationIndex +1]
+                                    LineManager.setStartAndEndStation(startStation,endStation)
+                                }
+                            }
+                            LineModel.arrivedStationSuccess()
+                            updateBusStatus()
                         }
 
                         override fun onComplete() {