修复弹窗共用decorView在某种情况下无法remove的问题

junixapp · junixapp · commit 617f6b69fcfa · 2019-02-02T14:55:03.000+08:00
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -22,6 +22,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".DemoActivity" />
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/lxj/xpopupdemo/DemoActivity.java b/app/src/main/java/com/lxj/xpopupdemo/DemoActivity.java
@@ -0,0 +1,36 @@
+package com.lxj.xpopupdemo;
+
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.widget.Toast;
+
+import com.lxj.xpopup.XPopup;
+import com.lxj.xpopup.interfaces.OnSelectListener;
+
+/**
+ * Description:
+ * Create by lxj, at 2019/2/2
+ */
+public class DemoActivity extends AppCompatActivity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        XPopup.get(this).asBottomList("haha", new String[]{"aaaa", "bbbb"}, new OnSelectListener() {
+            @Override
+            public void onSelect(int position, String text) {
+                Toast.makeText(DemoActivity.this, text, 0).show();
+            }
+        }).show();
+
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+
+                XPopup.get(DemoActivity.this).asLoading().show();
+            }
+        },0);
+    }
+}
diff --git a/app/src/main/java/com/lxj/xpopupdemo/XPopupApp.java b/app/src/main/java/com/lxj/xpopupdemo/XPopupApp.java
@@ -11,9 +11,9 @@ public class XPopupApp extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-//        if (LeakCanary.isInAnalyzerProcess(this)) {
-//            return;
-//        }
-//        LeakCanary.install(this);
+        if (LeakCanary.isInAnalyzerProcess(this)) {
+            return;
+        }
+        LeakCanary.install(this);
     }
 }
diff --git a/app/src/main/java/com/lxj/xpopupdemo/custompopup/ZhihuCommentPopup.java b/app/src/main/java/com/lxj/xpopupdemo/custompopup/ZhihuCommentPopup.java
@@ -1,6 +1,7 @@
 package com.lxj.xpopupdemo.custompopup;
 
 import android.content.Context;
+import android.content.Intent;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
@@ -11,6 +12,7 @@
 import com.lxj.xpopup.core.BottomPopupView;
 import com.lxj.xpopup.util.XPopupUtils;
 import com.lxj.xpopup.widget.VerticalRecyclerView;
+import com.lxj.xpopupdemo.DemoActivity;
 import com.lxj.xpopupdemo.R;
 
 import java.util.ArrayList;
@@ -45,12 +47,8 @@ protected void convert(@NonNull ViewHolder holder, @NonNull String s, int positi
         commonAdapter.setOnItemClickListener(new MultiItemTypeAdapter.SimpleOnItemClickListener(){
             @Override
             public void onItemClick(View view, RecyclerView.ViewHolder holder, int position) {
-                postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        dismiss();
-                    }
-                },200);
+                dismiss();
+                getContext().startActivity(new Intent(getContext(), DemoActivity.class));
             }
         });
         recyclerView.setHasFixedSize(true);
diff --git a/app/src/main/java/com/lxj/xpopupdemo/fragment/QuickStartDemo.java b/app/src/main/java/com/lxj/xpopupdemo/fragment/QuickStartDemo.java
@@ -186,7 +186,15 @@ public void onSelect(int position, String text) {
         }
     }
 
+    @Override
+    public void onPause() {
+        super.onPause();
+        Log.e("tag", "onPause");
+    }
 
-
-
+    @Override
+    public void onStop() {
+        super.onStop();
+        Log.e("tag", "onStop");
+    }
 }
diff --git a/library/src/main/java/com/lxj/xpopup/XPopup.java b/library/src/main/java/com/lxj/xpopup/XPopup.java
@@ -5,6 +5,7 @@
 import android.graphics.Color;
 import android.graphics.PointF;
 import android.os.Handler;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -46,8 +47,6 @@ public class XPopup {
     private static WeakReference<Context> contextRef;
     private PopupInfo tempInfo = null;
     private BasePopupView tempView;
-    private Handler handler = new Handler();
-    private static ViewGroup decorView = null;
     private int primaryColor = Color.parseColor("#121212");
     private static ArrayList<BasePopupView> popupViews = new ArrayList<>();
 
@@ -121,39 +120,51 @@ private void showInternal(final BasePopupView pv) {
         }
         if (pv.getParent() != null) return;
         final Activity activity = (Activity) contextRef.get();
-        decorView = (ViewGroup) activity.getWindow().getDecorView();
-        decorView.addView(pv, new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT,
-                FrameLayout.LayoutParams.MATCH_PARENT));
-        decorView.bringChildToFront(pv);
-
-        //2. 执行初始化
-        pv.init(new Runnable() { // 弹窗显示动画执行完毕调用
+        pv.popupInfo.decorView = (ViewGroup) activity.getWindow().getDecorView();
+        // add PopupView to its decorView after measured.
+        pv.popupInfo.decorView.post(new Runnable() {
             @Override
             public void run() {
-                if (pv.popupInfo != null && pv.popupInfo.xPopupCallback != null)
-                    pv.popupInfo.xPopupCallback.onShow();
-
-                if (XPopupUtils.getDecorViewInvisibleHeight(activity) > 0) {
-                    XPopupUtils.moveUpToKeyboard(XPopupUtils.getDecorViewInvisibleHeight(activity), pv);
+                if(pv.getParent()!=null){
+                    ((ViewGroup)pv.getParent()).removeView(pv);
                 }
+                pv.popupInfo.decorView.addView(pv, new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT,
+                        FrameLayout.LayoutParams.MATCH_PARENT));
 
-            }
-        }, new Runnable() {             // 弹窗消失动画执行完毕调用
-            @Override
-            public void run() {
-                popupViews.remove(pv);
-                if (pv.popupInfo != null && pv.popupInfo.xPopupCallback != null)
-                    pv.popupInfo.xPopupCallback.onDismiss();
+                //2. 执行初始化
+                pv.init(new Runnable() { // 弹窗显示动画执行完毕调用
+                    @Override
+                    public void run() {
+                        if (pv.popupInfo != null && pv.popupInfo.xPopupCallback != null)
+                            pv.popupInfo.xPopupCallback.onShow();
 
-                // 移除弹窗
-                if (decorView != null) decorView.removeView(pv);
+                        if (XPopupUtils.getDecorViewInvisibleHeight(activity) > 0) {
+                            XPopupUtils.moveUpToKeyboard(XPopupUtils.getDecorViewInvisibleHeight(activity), pv);
+                        }
 
-                // 释放对象
-                release();
+                    }
+                }, new Runnable() {             // 弹窗消失动画执行完毕调用
+                    @Override
+                    public void run() {
+                        // 移除弹窗
+                        pv.popupInfo.decorView.removeView(pv);
+                        KeyboardUtils.removeLayoutChangeListener(pv.popupInfo.decorView);
+                        popupViews.remove(pv);
+                        if (pv.popupInfo != null && pv.popupInfo.xPopupCallback != null) {
+                            pv.popupInfo.xPopupCallback.onDismiss();
+                        }
+                        pv.popupInfo = null;
+
+                        // 释放对象
+                        release();
+                    }
+                });
             }
         });
     }
 
+
+
     /**
      * 消失
      */
@@ -189,11 +200,8 @@ public void dismiss(Object tag) {
      */
     private void release() {
         if (!popupViews.isEmpty()) return;
-        handler.removeCallbacks(null);
         if (contextRef != null) contextRef.clear();
-        if (decorView != null) KeyboardUtils.removeLayoutChangeListener(decorView);
         contextRef = null;
-        decorView = null;
     }
 
     /**
diff --git a/library/src/main/java/com/lxj/xpopup/core/BasePopupView.java b/library/src/main/java/com/lxj/xpopup/core/BasePopupView.java
@@ -51,10 +51,6 @@ public BasePopupView(@NonNull Context context) {
         // 事先隐藏，等测量完毕恢复。避免View影子跳动现象
         contentView.setAlpha(0);
         addView(contentView);
-        // 如果有导航栏，则不能覆盖导航栏，
-        if (XPopupUtils.isNavBarVisible(getContext())) {
-            setPadding(0, 0, 0, XPopupUtils.getNavBarHeight());
-        }
     }
 
     public BasePopupView(@NonNull Context context, @Nullable AttributeSet attrs) {
@@ -119,6 +115,10 @@ public void init(final Runnable afterAnimationStarted, Runnable afterAnimationEn
         post(new Runnable() {
             @Override
             public void run() {
+                // 如果有导航栏，则不能覆盖导航栏，
+                if (XPopupUtils.isNavBarVisible(getContext())) {
+                    setPadding(0, 0, 0, XPopupUtils.getNavBarHeight());
+                }
                 getPopupContentView().setAlpha(1f);
 
                 //2. 收集动画执行器
@@ -301,7 +301,6 @@ protected void doAfterDismiss(){
             public void run() {
                 afterAnimationEnd.run();
                 popupStatus = PopupStatus.Dismiss;
-                popupInfo = null;
             }
         }, getAnimationDuration());
     }
diff --git a/library/src/main/java/com/lxj/xpopup/core/BottomPopupView.java b/library/src/main/java/com/lxj/xpopup/core/BottomPopupView.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.support.annotation.NonNull;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 
diff --git a/library/src/main/java/com/lxj/xpopup/core/PopupInfo.java b/library/src/main/java/com/lxj/xpopup/core/PopupInfo.java
@@ -2,6 +2,7 @@
 
 import android.graphics.PointF;
 import android.view.View;
+import android.view.ViewGroup;
 
 import com.lxj.xpopup.animator.PopupAnimator;
 import com.lxj.xpopup.enums.PopupAnimation;
@@ -27,6 +28,8 @@ public class PopupInfo {
 
     public XPopupCallback xPopupCallback;
 
+    public ViewGroup decorView; //每个弹窗所属的DecorView
+
     public View getAtView() {
         return atView;
     }
diff --git a/library/src/main/java/com/lxj/xpopup/widget/SmartDragLayout.java b/library/src/main/java/com/lxj/xpopup/widget/SmartDragLayout.java
@@ -7,6 +7,7 @@
 import android.support.v4.view.ViewCompat;
 import android.support.v7.widget.CardView;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
@@ -134,24 +135,29 @@ public void scrollTo(int x, int y) {
         if (isUserClose && fraction == 0f && listener != null) {
             listener.onClose();
         }
+        Log.e("tag", "scrollTo  fraction: "+fraction);
         isScrollUp = y > getScrollY();
         super.scrollTo(x, y);
     }
 
     @Override
     public void computeScroll() {
         super.computeScroll();
+//        Log.e("tag", "scroller.isFinished() : "+scroller.isFinished() +
+//                "  scroller.computeScrollOffset(): "+scroller.computeScrollOffset());
         if (scroller.computeScrollOffset()) {
             scrollTo(scroller.getCurrX(), scroller.getCurrY());
             ViewCompat.postInvalidateOnAnimation(this);
         }
     }
 
+
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         isScrollUp = false;
         isUserClose = false;
+        Log.e("tag", "onDetachedFromWindow  isUserClose: "+isUserClose);
     }
 
     public void open() {
@@ -160,6 +166,7 @@ public void open() {
     }
 
     public void close() {
+        Log.e("tag", "close  isUserClose: "+isUserClose);
         isUserClose = true;
         scroller.startScroll(getScrollX(), getScrollY(), 0, minY - getScrollY(), 500);
         ViewCompat.postInvalidateOnAnimation(this);

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@ public class XPopupApp extends Application {`
`11`	`11`	`@Override`
`12`	`12`	`public void onCreate() {`
`13`	`13`	`super.onCreate();`
`14`		`-// if (LeakCanary.isInAnalyzerProcess(this)) {`
`15`		`-// return;`
`16`		`-// }`
`17`		`-// LeakCanary.install(this);`
	`14`	`+ if (LeakCanary.isInAnalyzerProcess(this)) {`
	`15`	`+ return;`
	`16`	`+ }`
	`17`	`+ LeakCanary.install(this);`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,15 @@ public void onSelect(int position, String text) {`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`
	`189`	`+ @Override`
	`190`	`+ public void onPause() {`
	`191`	`+ super.onPause();`
	`192`	`+ Log.e("tag", "onPause");`
	`193`	`+ }`
`189`	`194`
`190`		`-`
`191`		`-`
	`195`	`+ @Override`
	`196`	`+ public void onStop() {`
	`197`	`+ super.onStop();`
	`198`	`+ Log.e("tag", "onStop");`
	`199`	`+ }`
`192`	`200`	`}`