From 3f59d7705e544dd1f497fec4b519e85adb4e72ee Mon Sep 17 00:00:00 2001
From: weikaiyun <weikaiyun@pwrd.com>
Date: Thu, 22 Oct 2020 10:29:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/codeStyles/Project.xml                  | 15 ++-----
 .../fragmentation/ExtraTransaction.java       | 41 ++++++++++++-------
 .../fragmentation/TransactionDelegate.java    |  2 +-
 3 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3cc336b..7a748e4 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,18 +3,9 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
+          <package name="java.util" withSubpackages="false" static="false" />
+          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
+          <package name="io.ktor" withSubpackages="true" static="false" />
         </value>
       </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
diff --git a/fragmentation/src/main/java/com/weikaiyun/fragmentation/ExtraTransaction.java b/fragmentation/src/main/java/com/weikaiyun/fragmentation/ExtraTransaction.java
index e0ae8a8..8c3a472 100644
--- a/fragmentation/src/main/java/com/weikaiyun/fragmentation/ExtraTransaction.java
+++ b/fragmentation/src/main/java/com/weikaiyun/fragmentation/ExtraTransaction.java
@@ -49,6 +49,8 @@ public abstract ExtraTransaction setCustomAnimations(@AnimatorRes @AnimRes int t
 
     public abstract void replace(ISupportFragment toFragment);
 
+    public abstract void removeChild(ISupportFragment toFragment);
+
     /**
      * 使用setTag()自定义Tag时，使用下面popTo()／popToChild()出栈
      *
@@ -59,6 +61,8 @@ public abstract ExtraTransaction setCustomAnimations(@AnimatorRes @AnimRes int t
 
     public abstract void popTo(String targetFragmentTag, boolean includeTargetFragment, Runnable afterPopTransactionRunnable);
 
+    public abstract void loadChildRootFragment(int containerId, ISupportFragment toFragment);
+
     public abstract void remove(ISupportFragment toFragment);
 
     public abstract void popToChild(String targetFragmentTag, boolean includeTargetFragment);
@@ -72,12 +76,12 @@ public abstract ExtraTransaction setCustomAnimations(@AnimatorRes @AnimRes int t
     final static class ExtraTransactionImpl<T extends ISupportFragment>
             extends ExtraTransaction {
 
-        private FragmentActivity mActivity;
-        private T mSupportF;
-        private Fragment mFragment;
-        private TransactionDelegate mTransactionDelegate;
-        private boolean mFromActivity;
-        private TransactionRecord mRecord;
+        private final FragmentActivity mActivity;
+        private final T mSupportF;
+        private final Fragment mFragment;
+        private final TransactionDelegate mTransactionDelegate;
+        private final boolean mFromActivity;
+        private final TransactionRecord mRecord;
 
         ExtraTransactionImpl(FragmentActivity activity, T supportF,
                              TransactionDelegate transactionDelegate, boolean fromActivity) {
@@ -123,11 +127,22 @@ public void loadRootFragment(int containerId, ISupportFragment toFragment) {
             mTransactionDelegate.loadRootTransaction(getFragmentManager(), containerId, toFragment);
         }
 
+        @Override
+        public void loadChildRootFragment(int containerId, ISupportFragment toFragment) {
+            toFragment.getSupportDelegate().mTransactionRecord = mRecord;
+            mTransactionDelegate.loadRootTransaction(getChildFragmentManager(), containerId, toFragment);
+        }
+
         @Override
         public void remove(ISupportFragment toFragment) {
             mTransactionDelegate.remove(getFragmentManager(), toFragment);
         }
 
+        @Override
+        public void removeChild(ISupportFragment toFragment) {
+            mTransactionDelegate.remove(getChildFragmentManager(), toFragment);
+        }
+
         @Override
         public void popTo(String targetFragmentTag, boolean includeTargetFragment) {
             popTo(targetFragmentTag, includeTargetFragment, null);
@@ -136,7 +151,6 @@ public void popTo(String targetFragmentTag, boolean includeTargetFragment) {
         @Override
         public void popTo(String targetFragmentTag, boolean includeTargetFragment,
                           Runnable afterPopTransactionRunnable) {
-
             mTransactionDelegate.popTo(targetFragmentTag, includeTargetFragment,
                     afterPopTransactionRunnable, getFragmentManager());
         }
@@ -149,13 +163,8 @@ public void popToChild(String targetFragmentTag, boolean includeTargetFragment)
         @Override
         public void popToChild(String targetFragmentTag, boolean includeTargetFragment,
                                Runnable afterPopTransactionRunnable) {
-
-            if (mFromActivity) {
-                popTo(targetFragmentTag, includeTargetFragment, afterPopTransactionRunnable);
-            } else {
-                mTransactionDelegate.popTo(targetFragmentTag, includeTargetFragment,
-                        afterPopTransactionRunnable, mFragment.getChildFragmentManager());
-            }
+            mTransactionDelegate.popTo(targetFragmentTag, includeTargetFragment,
+                    afterPopTransactionRunnable, getChildFragmentManager());
         }
 
         @Override
@@ -210,6 +219,10 @@ private FragmentManager getFragmentManager() {
             if (mFragment == null) {
                 return mActivity.getSupportFragmentManager();
             }
+            return mFragment.getParentFragmentManager();
+        }
+
+        private FragmentManager getChildFragmentManager() {
             return mFragment.getChildFragmentManager();
         }
     }
diff --git a/fragmentation/src/main/java/com/weikaiyun/fragmentation/TransactionDelegate.java b/fragmentation/src/main/java/com/weikaiyun/fragmentation/TransactionDelegate.java
index 45a7f2f..357efd6 100644
--- a/fragmentation/src/main/java/com/weikaiyun/fragmentation/TransactionDelegate.java
+++ b/fragmentation/src/main/java/com/weikaiyun/fragmentation/TransactionDelegate.java
@@ -35,7 +35,7 @@ class TransactionDelegate {
     static final int TYPE_ADD_RESULT_WITHOUT_HIDE = 3;
     static final int TYPE_REPLACE = 4;
 
-    private Handler mHandler;
+    private final Handler mHandler;
 
     ActionQueue mActionQueue;