From 9224f20254cbc89b1529c7373ebc78dec25b70f4 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 1 Jul 2022 17:48:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=E5=BC=80=E5=8F=91=E7=97=95?=
 =?UTF-8?q?=E8=BF=B9=E5=92=8C=E4=B8=80=E4=B8=AAView=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E5=86=85=E5=AD=98=E6=B3=84=E6=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/taxi/passenger/ui/TaxiPassengerBaseFragment.java     | 5 +++--
 .../och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt   | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
index a25949c8e4..d7ed74a9d6 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
@@ -128,7 +128,8 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
         });
 
         findViewById(R.id.iv_temp).setOnClickListener(view -> {
-            OverlayLeftViewUtils.INSTANCE.showOverlayView(getActivity());
+//            OverlayLeftViewUtils.INSTANCE.showOverlayView(getActivity());
+//            OverlayLeftViewUtils.INSTANCE.dragTarget(vOpenLeft);
             //showOrHideArrivedEndLayout(true, "北京北京北京", "1527481606997577728");
             //showOrHidePressengerCheckPager(true, "开始站点开", "开始站点开始站点开始", "2", "京A888888", "18811539480");
             //OCHFloatWindowManager.getInstance().ShowFloatWindow(getContext());
@@ -136,7 +137,6 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
         });
 
         vOpenLeft.setOnClickListener(v -> OverlayLeftViewUtils.INSTANCE.open());
-        OverlayLeftViewUtils.INSTANCE.dragTarget(vOpenLeft);
     }
 
     private void initArrivedView(){
@@ -260,6 +260,7 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
                 ochServingOrderFragment = new TaxiPassengerServingOrderFragment().newInstance();
             }
             OverlayLeftViewUtils.INSTANCE.showOverlayView(getActivity());
+            OverlayLeftViewUtils.INSTANCE.dragTarget(vOpenLeft);
             if (ochServingOrderFragment.isHidden()){
                 transaction.show(ochServingOrderFragment).commitAllowingStateLoss();
                 return;
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt
index e276a09ede..6644fef855 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt
@@ -282,6 +282,10 @@ object OverlayLeftViewUtils {
         }
         FullVideoUtils.dismissOverlayView(true)
         // 管理的要关闭都得关闭
+        dragList.forEach {
+            it.setOnTouchListener(null)
+        }
+        dragList.clear()
         closeConsult()
         closeMovice()
         subscribe = null