From 58b15deea07e3fe93106e26fcf63368bf233f720 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 28 Oct 2024 17:12:52 +0800
Subject: [PATCH] =?UTF-8?q?[6.7.2]=20[fix]=20[=E5=86=85=E5=AD=98=E6=B3=84?=
 =?UTF-8?q?=E6=BC=8F=E6=A3=80=E6=B5=8B]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/wigets/autopilot/AutopilotState.kt |  1 +
 .../weaknet/ui/fragment/ShuttleFragment.kt    | 51 ++++++-------------
 .../och/unmanned/taxi/ui/base/TaxiFragment.kt |  2 +
 3 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotState.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotState.kt
index 1ae3d57c97..5495ba79b8 100644
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotState.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotState.kt
@@ -74,6 +74,7 @@ class AutopilotState @JvmOverloads constructor(
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
+        autopilotStateAnimator?.release()
     }
 
 
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt
index 834f69c446..367b907e56 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt
@@ -50,23 +50,21 @@ class ShuttleFragment : MvpFragment<ShuttleFragment?, BusPresenter?>() {
         context?.let {
             if(ProjectUtils.isSaas()&& AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)){
                 CallerEagleBaseFunctionCall4OchManager.addSingleToolKitDefaultItem(runningTaskGateWay,"本地缓存任务", R.drawable.bus_running_task_history,4)
-            }
-            CallerEagleBaseFunctionCall4OchManager.addToolKitDefaultItemClickListener(runningTaskGateWay,object :
-                IToolKitItemClickListener{
-                override fun onItemClick(toolTag: String, ctx: Context?) {
-                    when (toolTag) {
-                        runningTaskGateWay -> {
-                            d(TAG, "runningTaskGateWay:$runningTaskGateWay---toolTag:$toolTag")
-                            RunningTaskManager.showBadCaseConfigWindow(it)
+                CallerEagleBaseFunctionCall4OchManager.addToolKitDefaultItemClickListener(runningTaskGateWay,object :
+                    IToolKitItemClickListener{
+                    override fun onItemClick(toolTag: String, ctx: Context?) {
+                        when (toolTag) {
+                            runningTaskGateWay -> {
+                                d(TAG, "runningTaskGateWay:$runningTaskGateWay---toolTag:$toolTag")
+                                RunningTaskManager.showBadCaseConfigWindow(it)
+                            }
                         }
                     }
-                }
-            })
-            CallerEagleBaseFunctionCall4OchManager.addSingleToolKitCustomItem(lineView, LineView(it),10)
+                })
+                CallerEagleBaseFunctionCall4OchManager.addSingleToolKitCustomItem(lineView, LineView(it),10)
+            }
         }
 
-        initListener()
-
     }
 
     override fun initViews(savedInstanceState: Bundle?) {
@@ -87,7 +85,6 @@ class ShuttleFragment : MvpFragment<ShuttleFragment?, BusPresenter?>() {
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        EventBus.getDefault().register(this)
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
@@ -111,35 +108,17 @@ class ShuttleFragment : MvpFragment<ShuttleFragment?, BusPresenter?>() {
         if (mPresenter != null) {
             mPresenter!!.onDestroy(this)
         }
+        if(ProjectUtils.isSaas()&& AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) {
+            CallerEagleBaseFunctionCall4OchManager.removeToolkitByTag(mutableListOf(lineView))
+            CallerEagleBaseFunctionCall4OchManager.removeToolKitDefaultItemClickListener(lineView)
+        }
         super.onDestroyView()
-        CallerAutopilotRecordListenerManager.removeListener(TAG)
-        EventBus.getDefault().unregister(this)
     }
 
-    private fun initListener() {
-    }
-
-
     override fun onDestroy() {
         super.onDestroy()
     }
 
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    fun changeOverview(eventLogout: EventLogout) {
-        when (eventLogout.messgae) {
-            EventLogout.SHOW_QR_TYPE-> { //显示二维码
-
-            }
-            EventLogout.SHOW_WAIT_UPLOAD_TASK-> {
-                context?.let {
-                    RunningTaskManager.showBadCaseConfigWindow(it)
-                }
-            }
-            else -> {}
-        }
-    }
-
     /**
      * END
      */
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiFragment.kt
index 9814ec1b0a..7867df9029 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiFragment.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiFragment.kt
@@ -186,6 +186,8 @@ class TaxiFragment :MvpFragment<TaxiFragment?, TaxiPresenter?>(),
             it.removeAllLines()
             it.removeAllPoints()
         }
+        CallerEagleBaseFunctionCall4OchManager.removeToolkitByTag(mutableListOf(lineView))
+        CallerEagleBaseFunctionCall4OchManager.removeToolKitDefaultItemClickListener(lineView)
         startAutopilotAnimationView.cancelCountdown()
         super.onDestroyView()
     }