From 91c27b49fa8ebdace23c9ec362ae63fcf64fef1f Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Wed, 28 Aug 2024 15:50:17 +0800
Subject: [PATCH] =?UTF-8?q?[6.6.0]=20[shuttle]=20[=E6=8F=92=E5=85=A5?=
 =?UTF-8?q?=E5=A4=9A=E6=9D=A1=E6=95=B0=E6=8D=AE]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/och/weaknet/bean/BusRoutesResponse.kt    | 5 +----
 .../main/java/com/mogo/och/weaknet/model/BusLineModel.kt   | 7 +++++++
 .../java/com/mogo/och/weaknet/ui/BusSwitchLineActivity.kt  | 3 +--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusRoutesResponse.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusRoutesResponse.kt
index 997f4eaeb5..de37745926 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusRoutesResponse.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/BusRoutesResponse.kt
@@ -62,10 +62,7 @@ class BusRoutesResponse : BaseData() {
                 }
             }
             LineManager.setLineInfo(lineInfo)
-            LineManager.startStation = currentStation
-            if (currentStationIndex < result.size-1) {
-                LineManager.endStation = result[currentStationIndex + 1]
-            }
+
             return Pair(result,currentStationIndex)
         }
         fun bean2Db(sites: MutableList<BusStationBean>,lineId:Long,lineName:String?,taskId:Long) {
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/BusLineModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/BusLineModel.kt
index 771de09f21..649d50e491 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/BusLineModel.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/BusLineModel.kt
@@ -284,6 +284,13 @@ object BusLineModel {
                 val db2Beans = BusRoutesResponse.db2Beans(runnintTaskAndSites)
                 stationList = db2Beans.first
                 startStationIndex = db2Beans.second
+                stationList?.let {stationlist->
+                    LineManager.startStation = stationlist[startStationIndex]
+                    if (startStationIndex < stationlist.size-1) {
+                        LineManager.endStation = stationlist[startStationIndex + 1]
+                    }
+                }
+
             }
             // 设置自动驾驶信息
             currentTask?.lineId?.let {
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/BusSwitchLineActivity.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/BusSwitchLineActivity.kt
index 929f48e6e6..9c9a4c7db9 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/BusSwitchLineActivity.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/BusSwitchLineActivity.kt
@@ -109,7 +109,6 @@ class BusSwitchLineActivity : MvpActivity<BusSwitchLineView?, BusLinePresenter?>
             }
             animator?.start()
         }
-        mPresenter?.setRefreshTime()
         pb_start_task.progressTintList = ColorStateList.valueOf(Color.WHITE)
     }
 
@@ -133,6 +132,7 @@ class BusSwitchLineActivity : MvpActivity<BusSwitchLineView?, BusLinePresenter?>
      */
     private fun initDatas() {
         mPresenter?.queryBusLines()
+        mPresenter?.setRefreshTime()
     }
 
     /**
@@ -246,7 +246,6 @@ class BusSwitchLineActivity : MvpActivity<BusSwitchLineView?, BusLinePresenter?>
         //切换路线提交
         if (v.id == R.id.switch_line_btn_commit) {
             if(mAdapter.checkLine!=null&&mAdapter.checkTask!=null){
-                mPresenter?.commitSwitchLineId(mAdapter.checkTask!!,mAdapter.checkLine!!)
                 mPresenter?.let {
                     it.commitSwitchLineId(mAdapter.checkTask!!,mAdapter.checkLine!!)
                     startTaskLoading()