yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0

Browse Source
This commit is contained in:
董宏宇
2020-01-08 11:44:16 +08:00
parent 9da178f77a 0d0ea458f6
commit 88ff8f7eac
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
modules/mogo-module-main/src/main/java/com/mogo/module/main/fragmentmanager/FragmentStack.java
View File

@@ -54,7 +54,6 @@ public class FragmentStack {
mActivity = activity;
mFragmentManager = activity.getSupportFragmentManager();
mContainerId = containerId;
mFragmentTransaction = mFragmentManager.beginTransaction();
}
public void push( Fragment fragment, String tag ) {
@@ -65,6 +64,9 @@ public class FragmentStack {
Logger.w( TAG, "fragment has already in stack." );
return;
}
mFragmentTransaction = mFragmentManager.beginTransaction();
if ( mCurrentFragment != null ) {
mFragmentTransaction.hide( mCurrentFragment );
}
@@ -80,25 +82,27 @@ public class FragmentStack {
}
public void pop() {
if ( mFragmentStack.isEmpty() ) {
return;
}
mFragmentTransaction = mFragmentManager.beginTransaction();
mCurrentFragment = mFragmentStack.pop();
if ( mCurrentFragment != null ) {
mFragmentTransaction.remove( mCurrentFragment );
}
if ( mFragmentStack.isEmpty() ) {
mFragmentTransaction.commitAllowingStateLoss();
mCurrentFragment = null;
} else {
mFragmentStack.pop();
if ( !mFragmentStack.isEmpty() ) {
Fragment fragment = mFragmentStack.peek();
if ( fragment != null ) {
mFragmentTransaction.show( fragment );
mFragmentTransaction.commitAllowingStateLoss();
}
mCurrentFragment = fragment;
} else {
mCurrentFragment = null;
}
return;
}
Fragment fragment = mFragmentStack.peek();
if ( fragment != null ) {
mFragmentTransaction.show( fragment );
mFragmentTransaction.commitAllowingStateLoss();
}
mCurrentFragment = fragment;
if ( getFragmentStackTransactionListener() != null ) {
getFragmentStackTransactionListener().onTransaction();