From 1c513c2127506eb941028361e5fcb32cae55a98b Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 26 Aug 2024 10:52:54 +0800
Subject: [PATCH] =?UTF-8?q?[6.6.0]=20[=E8=B5=84=E6=BA=90=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/weaknet/fragment/ShuttleFragment.kt    |  6 +++---
 .../com/mogo/och/weaknet/presenter/BusPresenter.kt  | 13 ++++---------
 .../driver_weaknet/src/main/res/values/strings.xml  |  2 +-
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/fragment/ShuttleFragment.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/fragment/ShuttleFragment.kt
index cfd7163ff1..51359d3693 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/fragment/ShuttleFragment.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/fragment/ShuttleFragment.kt
@@ -183,15 +183,15 @@ class ShuttleFragment : BaseShuttleTabFragment<ShuttleFragment?, BusPresenter?>(
         }
 
         UiThreadHandler.post(Runnable {
-            if (stationList == null) {
+        if (stationList == null) {
                 // 获取小巴数据失败
                 return@Runnable
             }
             showStationsPanel()
             showOrHideSwitchLineBtn(false)
 
-            mLineName!!.text = lineName
-            mTaskTime!!.text = ResourcesUtils.getString(R.string.bus_line_time_tag,lineTime)
+            mLineName?.text = lineName
+            mTaskTime?.text = ResourcesUtils.getString(R.string.shuttle_line_time_tag,lineTime)
             // 渲染小巴路线数据
             updateBusStationStatus(stationList, arrivingOrArrivedIndex, isArrived)
         }, UiThreadHandler.MODE.QUEUE)
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/presenter/BusPresenter.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/presenter/BusPresenter.kt
index cf2ec10039..9a5966b99c 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/presenter/BusPresenter.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/presenter/BusPresenter.kt
@@ -99,15 +99,10 @@ class BusPresenter(view: ShuttleFragment?) : Presenter<ShuttleFragment?>(view),
             arrivingOrArrivedIndex - 1
         }
         d(SceneConstant.M_BUS + "BusOrderModel =", " mCurrentStation =$mCurrentStation")
-
-        UiThreadHandler.post({
-            if (mView != null) {
-                mView!!.updateBusTaskStatus(
-                    lineName, lineTime,
-                    stationList, arrivingOrArrivedIndex, isArrived
-                )
-            }
-        }, UiThreadHandler.MODE.QUEUE)
+        mView?.updateBusTaskStatus(
+            lineName, lineTime,
+            stationList, arrivingOrArrivedIndex, isArrived
+        )
     }
 
     override fun updateEmptyUi() {
diff --git a/OCH/shuttle/driver_weaknet/src/main/res/values/strings.xml b/OCH/shuttle/driver_weaknet/src/main/res/values/strings.xml
index c120ea0b01..c6fd4ff49e 100644
--- a/OCH/shuttle/driver_weaknet/src/main/res/values/strings.xml
+++ b/OCH/shuttle/driver_weaknet/src/main/res/values/strings.xml
@@ -30,7 +30,7 @@
     <string name="bus_arrived_str">进站</string>
     <string name="bus_station_txt_tag_start">起</string>
     <string name="bus_station_txt_tag_end">终</string>
-    <string name="bus_line_time_tag">班次：%1$s</string>
+    <string name="shuttle_line_time_tag">班次：%1$s</string>
 
     <string name="bus_refresh_time">更新时间：%1$s</string>