fragment回退优化

weikaiyun · Oct 1, 2020 · 277fd90 · 277fd90
1 parent a9b7abd
commit 277fd90
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 26 deletions.
diff --git a/fragmentation/src/main/java/com/weikaiyun/fragmentation/SupportActivityDelegate.java b/fragmentation/src/main/java/com/weikaiyun/fragmentation/SupportActivityDelegate.java
@@ -100,19 +100,17 @@ public void onBackPressedSupport() {
         List<Fragment> list = FragmentationMagician.getActiveFragments(getSupportFragmentManager());
         int fragmentNum = 0;
         for (Fragment f : list) {
-            if (f instanceof ISupportFragment) {
+            if (f instanceof ISupportFragment && ((ISupportFragment) f).getSupportDelegate().isCanPop()) {
                 fragmentNum++;
             }
         }
-        if (fragmentNum > 1) {
+        if (fragmentNum > 0) {
             pop();
         } else {
             ActivityCompat.finishAfterTransition(mActivity);
         }
     }
 
-    /**********************************************************************************************/
-
     /**
      * 加载根Fragment, 即Activity内的第一个Fragment 或 Fragment内的第一个子Fragment
      */

diff --git a/fragmentation/src/main/java/com/weikaiyun/fragmentation/SupportFragment.java b/fragmentation/src/main/java/com/weikaiyun/fragmentation/SupportFragment.java
@@ -64,15 +64,15 @@ public void onResume() {
         }
 
         if (!isHidden()) {
-            getSupportDelegate().getVisibleDelegate().setVisible(true);
+            getSupportDelegate().setVisible(true);
             onVisible();
         }
     }
 
     @Override
     public void onPause() {
         super.onPause();
-        getSupportDelegate().getVisibleDelegate().setVisible(false);
+        getSupportDelegate().setVisible(false);
         onInvisible();
     }
 

diff --git a/fragmentation/src/main/java/com/weikaiyun/fragmentation/SupportFragmentDelegate.java b/fragmentation/src/main/java/com/weikaiyun/fragmentation/SupportFragmentDelegate.java
@@ -27,18 +27,31 @@ public class SupportFragmentDelegate {
     protected FragmentActivity _mActivity;
     private ISupportActivity mSupport;
 
-    private VisibleDelegate visibleDelegate;
+    private boolean isVisible;
+
+    private boolean canPop = true;
+
+    public void setCanPop(boolean canPop) {
+        this.canPop = canPop;
+    }
+
+    public boolean isCanPop() {
+        return canPop;
+    }
+
+    public void setVisible(boolean visible) {
+        isVisible = visible;
+    }
+
+    public boolean isVisible() {
+        return isVisible;
+    }
 
     public SupportFragmentDelegate(ISupportFragment support) {
         if (!(support instanceof Fragment))
             throw new RuntimeException("Must extends Fragment");
         this.mSupportF = support;
         this.mFragment = (Fragment) support;
-        visibleDelegate = new VisibleDelegate();
-    }
-
-    public VisibleDelegate getVisibleDelegate() {
-        return visibleDelegate;
     }
 
     /**

diff --git a/fragmentation/src/main/java/com/weikaiyun/fragmentation/TransactionDelegate.java b/fragmentation/src/main/java/com/weikaiyun/fragmentation/TransactionDelegate.java
@@ -69,6 +69,7 @@ public void run() {
                     }
                 }
 
+                to.getSupportDelegate().setCanPop(false);
                 start(fm, null, to, toFragmentTag, TYPE_REPLACE);
             }
         });
@@ -84,6 +85,8 @@ public void run() {
                 for (int i = 0; i < tos.length; i++) {
                     Fragment to = (Fragment) tos[i];
 
+                    ((ISupportFragment) to).getSupportDelegate().setCanPop(false);
+
                     bindContainerId(containerId, tos[i]);
 
                     String toName = to.getClass().getName();

diff --git a/fragmentation/src/main/java/com/weikaiyun/fragmentation/VisibleDelegate.java b/fragmentation/src/main/java/com/weikaiyun/fragmentation/VisibleDelegate.java
diff --git a/fragmentation/src/main/java/com/weikaiyun/fragmentation/debug/DebugStackDelegate.java b/fragmentation/src/main/java/com/weikaiyun/fragmentation/debug/DebugStackDelegate.java
@@ -141,7 +141,7 @@ private void addDebugFragmentRecord(List<DebugFragmentRecord> fragmentRecords, F
         if (fragment != null) {
             CharSequence name = fragment.getClass().getSimpleName();
 
-            if (fragment instanceof ISupportFragment && ((ISupportFragment)fragment).getSupportDelegate().getVisibleDelegate().isVisible()) {
+            if (fragment instanceof ISupportFragment && ((ISupportFragment)fragment).getSupportDelegate().isVisible()) {
                 name = span(name, " ☀");
             }