接口优化

weikaiyun · Oct 22, 2020 · 3f59d77 · 3f59d77
1 parent cdb2a6a
commit 3f59d77
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 27 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git 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
@@ -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;