From 02ba6e79052bfe3b24ad3aed5058aea5854d324d Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Fri, 27 Sep 2024 14:27:13 +0800
Subject: [PATCH] =?UTF-8?q?[6.7.0][=E5=B7=A5=E5=85=B7=E7=AE=B1]=20refactor?=
 =?UTF-8?q?:=20och=20item=20=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=20toolTag=20=E8=BF=87=E6=BB=A4=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/weaknet/ui/fragment/ShuttleFragment.kt  |  6 +++++-
 .../com/mogo/och/taxi/ui/BaseTaxiTabFragment.java    | 10 ++++++----
 .../och/unmanned/taxi/ui/base/BaseTaxiTabFragment.kt | 12 ++++++++----
 3 files changed, 19 insertions(+), 9 deletions(-)

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 609159c0d5..7a83fdeaf7 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
@@ -61,7 +61,11 @@ class ShuttleFragment : MvpFragment<ShuttleFragment?, BusPresenter?>() {
             CallerEagleBaseFunctionCall4OchManager.addToolKitDefaultItemClickListener(runningTaskGateWay,object :
                 IToolKitItemClickListener{
                 override fun onItemClick(toolTag: String, ctx: Context?) {
-                    RunningTaskManager.showBadCaseConfigWindow(it)
+                    when (toolTag) {
+                        runningTaskGateWay -> {
+                            RunningTaskManager.showBadCaseConfigWindow(it)
+                        }
+                    }
                 }
             })
             CallerEagleBaseFunctionCall4OchManager.addSingleToolKitCustomItem(lineView, LineView(it),10)
diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
index cee8353a29..5fc43f454f 100644
--- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
+++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
@@ -191,10 +191,12 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
             CallerEagleBaseFunctionCall4OchManager.INSTANCE.addToolKitDefaultItemClickListener(runningTaskGateWay, new IToolKitItemClickListener() {
                 @Override
                 public void onItemClick(@NonNull String toolTag, @Nullable Context ctx) {
-                    personalDialogFragment = new WeakReference<>(new TaxiPersonalDialogFragment());
-                    FragmentActivity activity = getActivity();
-                    if (activity != null) {
-                        personalDialogFragment.get().show(activity.getSupportFragmentManager(), "service_data");
+                    if (runningTaskGateWay.equals(toolTag)) {
+                        personalDialogFragment = new WeakReference<>(new TaxiPersonalDialogFragment());
+                        FragmentActivity activity = getActivity();
+                        if (activity != null) {
+                            personalDialogFragment.get().show(activity.getSupportFragmentManager(), "service_data");
+                        }
                     }
                 }
             });
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/BaseTaxiTabFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/BaseTaxiTabFragment.kt
index b1444dc508..a3ca66c9d1 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/BaseTaxiTabFragment.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/BaseTaxiTabFragment.kt
@@ -202,10 +202,14 @@ abstract class BaseTaxiTabFragment<V : IView, P : Presenter<V>> : MvpFragment<V,
             CallerEagleBaseFunctionCall4OchManager.addToolKitDefaultItemClickListener(runningTaskGateWay,object :
                 IToolKitItemClickListener {
                 override fun onItemClick(toolTag: String, ctx: Context?) {
-                    personalDialogFragment = WeakReference(TaxiOperationalDialogFragment())
-                    activity?.supportFragmentManager?.let {
-                        personalDialogFragment!!.get()
-                            ?.show(it, "service_data")
+                    when(toolTag) {
+                        runningTaskGateWay -> {
+                            personalDialogFragment = WeakReference(TaxiOperationalDialogFragment())
+                            activity?.supportFragmentManager?.let {
+                                personalDialogFragment!!.get()
+                                    ?.show(it, "service_data")
+                            }
+                        }
                     }
                 }
             });