From 9557a59e414f06c9a3a30e52dbf59567acde0c29 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 13 Jun 2025 18:06:50 +0800
Subject: [PATCH] =?UTF-8?q?[8.0.0]=20[fix]=20[onVisibilityAggregated=20dat?=
 =?UTF-8?q?a=E4=BF=9D=E6=8C=81]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/biz/routing/ui/RoutingSwitchView.kt  | 15 ++++++++++++++-
 .../biz/routing/ui/runing/taxi/TaxiRunningView.kt |  9 ++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/RoutingSwitchView.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/RoutingSwitchView.kt
index a66c9f3c33..276f967260 100644
--- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/RoutingSwitchView.kt
+++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/RoutingSwitchView.kt
@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.findViewTreeViewModelStoreOwner
+import com.mogo.commons.module.status.MogoStatusManager
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
@@ -58,7 +59,15 @@ class RoutingSwitchView: ConstraintLayout, RoutingSwitchModel.SwtichLineViewCall
         super.onVisibilityAggregated(isVisible)
         if(isVisible){
             showLoadingView()
-            showRoutingSelectView()
+            if (MogoStatusManager.getInstance().isTaxiUnmanedDriverLineRoutingPerformTask) {
+                if(data!=null){
+                    showRoutingRunning(data!!)
+                }else{
+                    showRoutingSelectView()
+                }
+            }else {
+                showRoutingSelectView()
+            }
         }
     }
 
@@ -74,6 +83,7 @@ class RoutingSwitchView: ConstraintLayout, RoutingSwitchModel.SwtichLineViewCall
     }
 
     override fun showRoutingSelectView() {
+        this.data = null
         val endLoading = System.currentTimeMillis()
         val dex = (100-(endLoading - startLoading)).takeIf { it>=0 }?:0
         CallerLogger.d(TAG,"展示选择线路 lading 展示了 ${dex}毫秒")
@@ -85,7 +95,10 @@ class RoutingSwitchView: ConstraintLayout, RoutingSwitchModel.SwtichLineViewCall
         },dex, ThreadUtils.MODE.QUEUE)
     }
 
+    private var data: StartGrayAndQueryContrailRsp?=null
+
     override fun showRoutingRunning(data: StartGrayAndQueryContrailRsp) {
+        this.data = data
         val endLoading = System.currentTimeMillis()
         val dex = (100-(endLoading - startLoading)).takeIf { it>=0 }?:0
         CallerLogger.d(TAG,"展示线路 lading 展示了 ${dex}毫秒")
diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/TaxiRunningView.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/TaxiRunningView.kt
index 3f2e3b80d9..e65cc022eb 100644
--- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/TaxiRunningView.kt
+++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/runing/taxi/TaxiRunningView.kt
@@ -10,6 +10,7 @@ import androidx.lifecycle.findViewTreeViewModelStoreOwner
 import com.amap.api.navi.model.NaviLatLng
 import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import com.mogo.eagle.core.utilcode.util.ActivityUtils
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
@@ -26,7 +27,6 @@ import com.mogo.och.common.module.map.MapMakerManager
 import com.mogo.och.common.module.wigets.dialog.CommonDialogStatus
 import com.mogo.och.biz.routing.ui.errorpoint.ReportErrorPointView
 import com.mogo.och.biz.routing.ui.utils.TimeDistanceUtils
-import com.mogo.och.bridge.autopilot.line.LineManager
 import com.mogo.och.common.module.constant.OchCommonConst
 import kotlinx.android.synthetic.main.biz_taxi_running.view.actv_end_routing
 import kotlinx.android.synthetic.main.biz_taxi_running.view.actv_current_itinerary_end_name
@@ -86,6 +86,7 @@ class TaxiRunningView: ConstraintLayout, TaxiRunningModel.RoutingRuningCallback,
 
     private fun showFeedbackDialog(grayId: Long) {
         val occurrenceTime = System.currentTimeMillis()
+        val topActivity = ActivityUtils.getTopActivity()
         if(closeRouting==null) {
             closeRouting = CommonDialogStatus
                 .Builder()
@@ -96,7 +97,7 @@ class TaxiRunningView: ConstraintLayout, TaxiRunningModel.RoutingRuningCallback,
                 .cancelStr("线路不可用")
                 .confirmStr("线路可用")
                 .status(CommonDialogStatus.Status.success)
-                .build(context)
+                .build(topActivity)
         }else{
             if(closeRouting?.isShowing==true){
                 return
@@ -121,7 +122,9 @@ class TaxiRunningView: ConstraintLayout, TaxiRunningModel.RoutingRuningCallback,
                 )
             }
         })
-        closeRouting?.show()
+        if(!topActivity.isFinishing() && !topActivity.isDestroyed()) {
+            closeRouting?.show()
+        }
     }
 
     /**