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

This commit is contained in:
董宏宇
2020-01-10 12:05:15 +08:00
14 changed files with 114 additions and 20 deletions

View File

@@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="bottom"
android:paddingBottom="@dimen/dp_33">
android:paddingBottom="@dimen/dp_61">
<ImageView
android:id="@+id/module_apps_id_navigation"

View File

@@ -127,4 +127,20 @@ public class FragmentStack {
public void setFragmentStackTransactionListener( FragmentStackTransactionListener fragmentStackTransactionListener ) {
this.mFragmentStackTransactionListener = fragmentStackTransactionListener;
}
public void clearAll() {
if ( mFragmentStack.isEmpty() ) {
return;
}
mFragmentTransaction = mFragmentManager.beginTransaction();
for ( FragmentDescriptor descriptor : mFragmentStack ) {
mFragmentTransaction.remove( descriptor.getFragment() );
}
mFragmentTransaction.commitAllowingStateLoss();
mFragmentStack.clear();
mCurrentFragment = null;
if ( getFragmentStackTransactionListener() != null ) {
getFragmentStackTransactionListener().onTransaction();
}
}
}

View File

@@ -26,6 +26,11 @@ public class MogoFragmentManager implements IMogoFragmentManager {
FragmentStack.getInstance().pop();
}
@Override
public void clearAll() {
FragmentStack.getInstance().clearAll();
}
@Override
public void init( Context context ) {

View File

@@ -91,6 +91,7 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener {
rv_search_result.adapter = mAdapter
tv_navi_navi.setOnClickListener {
SearchServiceHolder.fragmentManager.clearAll()
SearchServiceHolder.getNavi(activity!!)
.startNavi(false)
}