From 33ad3c9d4845a5d2c3bc5f94f2447a6d35fc87a9 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 1 Nov 2024 12:10:41 +0800
Subject: [PATCH] =?UTF-8?q?[6.7.2]=20[fix]=20[=E6=9B=B4=E6=96=B0=E7=BA=BF?=
 =?UTF-8?q?=E8=B7=AF]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/weaknet/callback/IBusLinesCallback.java     |  1 +
 .../java/com/mogo/och/weaknet/model/LineModel.kt    |  7 ++++++-
 .../och/weaknet/ui/switchline/SwitchLineView.kt     |  8 +++++---
 .../och/weaknet/ui/switchline/SwtichLineModel.kt    | 13 +++++++++----
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusLinesCallback.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusLinesCallback.java
index 95f67a63b7..c145851761 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusLinesCallback.java
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/callback/IBusLinesCallback.java
@@ -13,6 +13,7 @@ public interface IBusLinesCallback {
     default void onChangeLineIdSuccess(){}
 
     default void onRefreshSuccess(long currentTimeStamp){}
+    default void onRefreshSuccessWIthData(){}
 
     default void onChangeLineIdFail(){}
 
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 f6ed55ee60..bb81f1a20a 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
@@ -147,7 +147,12 @@ object LineModel {
                         "接口信息发生变化 $lastChangeMd5 new md5${currentRequest}"
                     )
                     CarExecutableTaskResponse.save2Db(data)
-                    OrderModel.queryBusRoutes()
+                    RxUtils.createSubscribe(800) {
+                        // 等待写入数据库
+                        mBusLinesCallbackMap.forEach { callback ->
+                            callback.value.onRefreshSuccessWIthData()
+                        }
+                    }
                 }
 
                 override fun onError() {
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineView.kt
index 2a2482e8ef..364b028deb 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineView.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineView.kt
@@ -106,7 +106,7 @@ class SwitchLineView: WindowRelativeLayout, SwtichLineModel.SwtichLineViewCallba
      */
     fun loadingDatas() {
         CallerLogger.d(TAG,"加载线路去")
-        viewModel?.queryBusLines()
+        viewModel?.queryBusLines(true)
         viewModel?.setRefreshTime()
     }
 
@@ -132,7 +132,7 @@ class SwitchLineView: WindowRelativeLayout, SwtichLineModel.SwtichLineViewCallba
 
     }
 
-    override fun onBusLinesChange(data: MutableList<LineDataBean>?) {
+    override fun onBusLinesChange(data: MutableList<LineDataBean>?,show:Boolean) {
         if (data.isNullOrEmpty()) {
             showNoData(true)
         }else{
@@ -140,7 +140,9 @@ class SwitchLineView: WindowRelativeLayout, SwtichLineModel.SwtichLineViewCallba
             mAdapter.setDataList(data)
         }
         CallerLogger.d(TAG,"加载线路成功")
-        viewbizModel?.showSwitchLineInfoResult()
+        if(show) {
+            viewbizModel?.showSwitchLineInfoResult()
+        }
     }
 
     /**
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwtichLineModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwtichLineModel.kt
index e3b2375dea..7be4a873e7 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwtichLineModel.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwtichLineModel.kt
@@ -43,7 +43,7 @@ class SwtichLineModel :  ViewModel(), IBusLinesCallback {
         LineModel.setBusLinesCallback(TAG,this)
     }
 
-    fun queryBusLines() {
+    fun queryBusLines(loading:Boolean) {
         LineModel.queryBusLines()
         RxUtils.disposeSubscribe(endTaskDisposable)
         RepositoryManager.queryCanUseLine()
@@ -65,8 +65,8 @@ class SwtichLineModel :  ViewModel(), IBusLinesCallback {
 
                 override fun onNext(data: List<LineDataBean>) {
                     d(LineModel.TAG, "queryBusLines onNext ${data}")
-                    viewCallback?.onBusLinesChange(data.toMutableList())
-                    if(ProjectUtils.isSaas()&& AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) {
+                    viewCallback?.onBusLinesChange(data.toMutableList(),loading)
+                    if(RepositoryManager.supportDb()) {
 
                     }else{
                         SharedPrefsMgr.getInstance().putLong(EXECUTABLECHANGETIME, DateTimeUtil.getCurrentTimeStamp())
@@ -91,7 +91,7 @@ class SwtichLineModel :  ViewModel(), IBusLinesCallback {
 
     interface SwtichLineViewCallback{
         fun startTaskState(success: Boolean)
-        fun onBusLinesChange(data: MutableList<LineDataBean>?)
+        fun onBusLinesChange(data: MutableList<LineDataBean>?,show:Boolean)
         fun refreshDate(formatLongToString: String?)
     }
 
@@ -101,6 +101,11 @@ class SwtichLineModel :  ViewModel(), IBusLinesCallback {
         )
     }
 
+    override fun onRefreshSuccessWIthData() {
+        super.onRefreshSuccessWIthData()
+        queryBusLines(false)
+    }
+
     override fun onChangeLineIdFail() {
         viewCallback?.startTaskState(false)
     }