just delete children nodes

Author: guaishouN

library/src/main/java/com/gyso/treeview/GysoTreeView.java

@@ -51,7 +51,7 @@ public GysoTreeView(@NonNull Context context, @Nullable AttributeSet attrs, int
 
         //set animate default
         treeViewContainer.setAnimateAdd(true);
-        treeViewContainer.setAnimateRemove(false);
+        treeViewContainer.setAnimateRemove(true);
         treeViewContainer.setAnimateMove(true);
     }
 

library/src/main/java/com/gyso/treeview/TreeViewContainer.java

@@ -585,23 +585,22 @@ private void innerRemoveNode(NodeModel<?> nodeModel, boolean isRemoveChildNodesO
         if(adapter!=null){
             if(isAnimateRemove()){
                 recordAnchorLocationOnViewPort(true,isRemoveChildNodesOnly ,nodeModel);
-            }
-            if(isRemoveChildNodesOnly){
-                nodeModel.traverseChildren(next->adapter.getTreeModel().removeNode(nodeModel, next));
-            }else{
-                adapter.getTreeModel().removeNode(nodeModel.getParentNode(), nodeModel);
-            }
-
-            mTreeModel.calculateTreeNodesDeep();
-            if(isAnimateRemove()){
-                requestLayout();
+                if(isRemoveChildNodesOnly){
+                    nodeModel.traverseDirectChildren(next->adapter.getTreeModel().removeNode(nodeModel, next));
+                }else{
+                    adapter.getTreeModel().removeNode(nodeModel.getParentNode(), nodeModel);
+                }
             }else{
                 if(isRemoveChildNodesOnly){
-                    nodeModel.traverseChildren(this::removeViewByNode);
+                    nodeModel.traverseExcludeSelf(this::removeViewByNode);
+                    nodeModel.traverseDirectChildren(next->adapter.getTreeModel().removeNode(nodeModel, next));
                 }else{
-                    nodeModel.selfTraverse(this::removeViewByNode);
+                    nodeModel.traverseIncludeSelf(this::removeViewByNode);
+                    adapter.getTreeModel().removeNode(nodeModel.getParentNode(), nodeModel);
                 }
             }
+            mTreeModel.calculateTreeNodesDeep();
+            requestLayout();
         }
     }
 
@@ -630,11 +629,11 @@ private void recordAnchorLocationOnViewPort(boolean isRemove, boolean isRemoveCh
             //if remove, parent will be the target node
             Map<NodeModel<?>,View> removeNodeMap = new HashMap<>();
             if(isRemoveChildrenOnly){
-                targetNode.traverseChildren(node -> {
+                targetNode.traverseExcludeSelf(node -> {
                     removeNodeMap.put(node,getTreeViewHolder(node).getView());
                 });
             }else{
-                targetNode.selfTraverse(node -> {
+                targetNode.traverseIncludeSelf(node -> {
                     removeNodeMap.put(node,getTreeViewHolder(node).getView());
                 });
                 targetNode = targetNode.getParentNode();

library/src/main/java/com/gyso/treeview/model/NodeModel.java

@@ -4,6 +4,7 @@
 import androidx.annotation.Nullable;
 
 import java.io.Serializable;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Stack;
@@ -129,47 +130,58 @@ private boolean addChildNode(NodeModel<T> aChild){
      * @param node to deal node
      */
     private void traverse(NodeModel<T> node, INext<T> next){
+        traverse(node,next,true);
+    }
+
+    private void traverse(NodeModel<T> node, INext<T> next, boolean isIncludeSelf){
         if(node==null || next==null){
             return;
         }
         Stack<NodeModel<T>> stack = new Stack<>();
         stack.add(node);
         while (!stack.isEmpty()) {
             NodeModel<T> tmp = stack.pop();
-            next.next(tmp);
+            if(isIncludeSelf){
+                next.next(tmp);
+            }else if(tmp!=this){
+                next.next(tmp);
+            }
             LinkedList<NodeModel<T>> childNodes = tmp.getChildNodes();
             stack.addAll(childNodes);
         }
     }
+    /**
+     * traverse all sub node include self
+     * @param next callback
+     */
+    public void traverseIncludeSelf(INext<T> next){
+        if(next==null){
+            return;
+        }
+        traverse(this,next,true);
+    }
 
     /**
-     * traverse bys self
+     * traverse all sub node exclude self
      * @param next callback
      */
-    public void selfTraverse(INext<T> next){
+    public void traverseExcludeSelf(INext<T> next){
         if(next==null){
             return;
         }
-        traverse(this,next);
+        traverse(this,next,false);
     }
 
     /**
-     * traverse bys self
+     * traverse only direct children
      * @param next callback
      */
-    public void traverseChildren(INext<T> next){
+    public void traverseDirectChildren(INext<T> next){
         if(next==null){
             return;
         }
-        Stack<NodeModel<T>> stack = new Stack<>();
-        stack.add(this);
-        while (!stack.isEmpty()) {
-            NodeModel<T> tmp = stack.pop();
-            if(tmp!=this){
-                next.next(tmp);
-            }
-            LinkedList<NodeModel<T>> childNodes = tmp.getChildNodes();
-            stack.addAll(childNodes);
+        for (NodeModel<T> childNode : new LinkedList<>(childNodes)) {
+            next.next(childNode);
         }
     }
 

local.properties

@@ -5,5 +5,5 @@
 # For customization when using a Version Control System, please read the
 # header note.
 #Mon Jun 07 23:21:30 CST 2021
-//sdk.dir=D\:\\AndroidTool\\Sdk
-sdk.dir=D\:\\programfiles\\sdk
+sdk.dir=D\:\\AndroidTool\\Sdk
+//sdk.dir=D\:\\programfiles\\sdk