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() { 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(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> : MvpFragment { + personalDialogFragment = WeakReference(TaxiOperationalDialogFragment()) + activity?.supportFragmentManager?.let { + personalDialogFragment!!.get() + ?.show(it, "service_data") + } + } } } });