GithubStar/QMUI_Android
1
0
Fork 0
mirror of https://github.com/Tencent/QMUI_Android.git synced 2026-10-27 10:29:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: re order the swipe back handle condition.

Browse Source
This commit is contained in:
cgspine
2021-11-26 12:36:37 +08:00
parent dd79581985
commit db13fdbabd
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/src/main/java/com/qmuiteam/qmui/arch/QMUIFragment.java
+21 -19
View File
@@ -16,6 +16,16 @@
package com.qmuiteam.qmui.arch;
import static com.qmuiteam.qmui.arch.SwipeBackLayout.DRAG_DIRECTION_BOTTOM_TO_TOP;
import static com.qmuiteam.qmui.arch.SwipeBackLayout.DRAG_DIRECTION_LEFT_TO_RIGHT;
import static com.qmuiteam.qmui.arch.SwipeBackLayout.DRAG_DIRECTION_NONE;
import static com.qmuiteam.qmui.arch.SwipeBackLayout.DRAG_DIRECTION_RIGHT_TO_LEFT;
import static com.qmuiteam.qmui.arch.SwipeBackLayout.DRAG_DIRECTION_TOP_TO_BOTTOM;
import static com.qmuiteam.qmui.arch.SwipeBackLayout.EDGE_BOTTOM;
import static com.qmuiteam.qmui.arch.SwipeBackLayout.EDGE_LEFT;
import static com.qmuiteam.qmui.arch.SwipeBackLayout.EDGE_RIGHT;
import static com.qmuiteam.qmui.arch.SwipeBackLayout.EDGE_TOP;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
@@ -74,16 +84,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import static com.qmuiteam.qmui.arch.SwipeBackLayout.DRAG_DIRECTION_BOTTOM_TO_TOP;
import static com.qmuiteam.qmui.arch.SwipeBackLayout.DRAG_DIRECTION_LEFT_TO_RIGHT;
import static com.qmuiteam.qmui.arch.SwipeBackLayout.DRAG_DIRECTION_NONE;
import static com.qmuiteam.qmui.arch.SwipeBackLayout.DRAG_DIRECTION_RIGHT_TO_LEFT;
import static com.qmuiteam.qmui.arch.SwipeBackLayout.DRAG_DIRECTION_TOP_TO_BOTTOM;
import static com.qmuiteam.qmui.arch.SwipeBackLayout.EDGE_BOTTOM;
import static com.qmuiteam.qmui.arch.SwipeBackLayout.EDGE_LEFT;
import static com.qmuiteam.qmui.arch.SwipeBackLayout.EDGE_RIGHT;
import static com.qmuiteam.qmui.arch.SwipeBackLayout.EDGE_TOP;
/**
* With the use of {@link QMUIFragmentActivity}, {@link QMUIFragment} brings more features,
* such as swipe back, transition config, and so on.
@@ -1190,10 +1190,6 @@ public abstract class QMUIFragment extends Fragment implements
protected boolean canHandleSwipeBack(){
mCalled = true;
// 1. can not swipe back if enter animation is not finished
if (mEnterAnimationStatus != ANIMATION_ENTER_STATUS_END) {
return false;
}
QMUIFragmentContainerProvider provider = findFragmentContainerProvider(false);
if (provider == null) {
@@ -1201,28 +1197,34 @@ public abstract class QMUIFragment extends Fragment implements
}
FragmentManager fragmentManager = provider.getContainerFragmentManager();
// 3. is not managed by QMUIFragmentContainerProvider
// 1. is not managed by QMUIFragmentContainerProvider
if (fragmentManager == null || fragmentManager != getParentFragmentManager()) {
return false;
}
// 4. should handle by child
// 2. should handle by child
if(provider.isChildHandlePopBackRequested()){
return false;
}
// 5. can not swipe back if the view is null
// 3. can not swipe back if the view is null
View view = getView();
if (view == null) {
return false;
}
// 6. can not swipe back if the backStack entry count is less than 2
if (fragmentManager.getBackStackEntryCount() <= 1 &&
int backStackEntryCount = fragmentManager.getBackStackEntryCount()
// 4. can not swipe back if the backStack entry count is less than 2
if (backStackEntryCount <= 1 &&
!QMUISwipeBackActivityManager.getInstance().canSwipeBack()) {
return false;
}
// 5. can not swipe back if enter animation is not finished
if (mEnterAnimationStatus != ANIMATION_ENTER_STATUS_END && backStackEntryCount > 1) {
return false;
}
return true;
}