fix bug

mylhyl · May 19, 2020 · 93d45b7 · 93d45b7
1 parent 56ebf3c
commit 93d45b7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/circledialog/src/main/java/com/mylhyl/circledialog/view/AbsBuildView.java b/circledialog/src/main/java/com/mylhyl/circledialog/view/AbsBuildView.java
@@ -6,17 +6,18 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.widget.LinearLayout;
 
+import androidx.cardview.widget.CardView;
+
 import com.mylhyl.circledialog.internal.BuildView;
 import com.mylhyl.circledialog.internal.CircleParams;
 import com.mylhyl.circledialog.internal.Controller;
 import com.mylhyl.circledialog.params.CloseParams;
 import com.mylhyl.circledialog.view.listener.ButtonView;
 import com.mylhyl.circledialog.view.listener.CloseView;
 
-import androidx.cardview.widget.CardView;
-
 /**
  * view的层次结构
  * <pre>
@@ -48,6 +49,10 @@ protected final View layoutInflaterFrom(int resource) {
     }
 
     protected final void addViewByBody(View child) {
+        ViewParent parent = child.getParent();
+        if (parent != null) {
+            ((ViewGroup) parent).removeView(child);
+        }
         mRootCardViewByLinearLayout.addView(child);
     }
 

diff --git a/circledialog/src/main/java/com/mylhyl/circledialog/view/BuildViewCustomBodyImpl.java b/circledialog/src/main/java/com/mylhyl/circledialog/view/BuildViewCustomBodyImpl.java
@@ -29,15 +29,16 @@ public void buildBodyView() {
         buildRootView();
         buildTitleView();
 
-        if (mCustomBodyView == null) {
-            if (mParams.bodyViewId != 0) {
-                mCustomBodyView = layoutInflaterFrom(mParams.bodyViewId);
-            } else {
-                mCustomBodyView = mParams.bodyView;
-            }
-            if (mCustomBodyView != null) {
-                addViewByBody(mCustomBodyView);
-            }
+        if (mCustomBodyView != null) {
+            return;
+        }
+        if (mParams.bodyViewId != 0) {
+            mCustomBodyView = layoutInflaterFrom(mParams.bodyViewId);
+        } else {
+            mCustomBodyView = mParams.bodyView;
+        }
+        if (mCustomBodyView != null) {
+            addViewByBody(mCustomBodyView);
         }
     }