Skip to content

Commit 2b3b5a7

Browse files
committed
see 10/01 log
1 parent 28a0b46 commit 2b3b5a7

File tree

12 files changed

+84
-411
lines changed

12 files changed

+84
-411
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ dependencies {
7373
releaseCompile leakCanary
7474
testCompile leakCanary
7575

76-
// compile 'com.blankj:utilcode:1.9.1'
76+
// compile 'com.blankj:utilcode:1.9.2'
7777
}
7878

7979

app/src/main/java/com/blankj/androidutilcode/core/fragment/Demo2Fragment.java renamed to app/src/main/java/com/blankj/androidutilcode/core/fragment/ChildFragment.java

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
* desc :
2121
* </pre>
2222
*/
23-
public class Demo2Fragment extends BaseFragment
23+
public class ChildFragment extends BaseFragment
2424
implements FragmentUtils.OnBackClickListener{
2525

2626
private TextView tvAboutFragment;
2727

28-
public static Demo2Fragment newInstance() {
28+
public static ChildFragment newInstance() {
2929
Bundle args = new Bundle();
30-
Demo2Fragment fragment = new Demo2Fragment();
30+
ChildFragment fragment = new ChildFragment();
3131
fragment.setArguments(args);
3232
return fragment;
3333
}
@@ -39,7 +39,7 @@ public void initData(Bundle bundle) {
3939

4040
@Override
4141
public int bindLayout() {
42-
return R.layout.fragment_demo2;
42+
return R.layout.fragment_child;
4343
}
4444

4545
@Override
@@ -59,24 +59,24 @@ public void doBusiness() {
5959
@Override
6060
public void onWidgetClick(View view) {
6161
tvAboutFragment.setText("");
62-
// switch (view.getId()) {
63-
// case R.id.btn_show_about_fragment:
64-
// tvAboutFragment.setText("lastAdd: " + FragmentUtils.getTop(getFragmentManager()).getClass().getSimpleName()
65-
// + "\nlastAddInStack: " + (FragmentUtils.getTopInStack(getFragmentManager()) != null ? FragmentUtils.getTopInStack(getFragmentManager()).getClass().getSimpleName() : "null")
66-
// + "\ntopShow: " + FragmentUtils.getTopShow(getFragmentManager()).getClass().getSimpleName()
67-
// + "\ntopShowInStack: " + (FragmentUtils.getTopShowInStack(getFragmentManager()) != null ? FragmentUtils.getTopShowInStack(getFragmentManager()).getClass().getSimpleName() : "null")
68-
// + "\n---all of fragments---\n"
69-
// + FragmentUtils.getAllFragments(getFragmentManager()).toString()
70-
// + "\n----------------------\n\n"
71-
// + "---stack top---\n"
72-
// + FragmentUtils.getAllFragmentsInStack(getFragmentManager()).toString()
73-
// + "\n---stack bottom---\n\n"
74-
// );
75-
// break;
62+
switch (view.getId()) {
63+
case R.id.btn_show_about_fragment:
64+
tvAboutFragment.setText("lastAdd: " + FragmentUtils.getTop(getFragmentManager()).getClass().getSimpleName()
65+
+ "\nlastAddInStack: " + (FragmentUtils.getTopInStack(getFragmentManager()) != null ? FragmentUtils.getTopInStack(getFragmentManager()).getClass().getSimpleName() : "null")
66+
+ "\ntopShow: " + FragmentUtils.getTopShow(getFragmentManager()).getClass().getSimpleName()
67+
+ "\ntopShowInStack: " + (FragmentUtils.getTopShowInStack(getFragmentManager()) != null ? FragmentUtils.getTopShowInStack(getFragmentManager()).getClass().getSimpleName() : "null")
68+
+ "\n---all of fragments---\n"
69+
+ FragmentUtils.getAllFragments(getFragmentManager()).toString()
70+
+ "\n----------------------\n\n"
71+
+ "---stack top---\n"
72+
+ FragmentUtils.getAllFragmentsInStack(getFragmentManager()).toString()
73+
+ "\n---stack bottom---\n\n"
74+
);
75+
break;
7676
// case R.id.btn_pop:
7777
// FragmentUtils.popFragment(getFragmentManager());
7878
// break;
79-
// }
79+
}
8080
}
8181

8282
@Override

app/src/main/java/com/blankj/androidutilcode/core/fragment/Demo1Fragment.java

Lines changed: 0 additions & 87 deletions
This file was deleted.

app/src/main/java/com/blankj/androidutilcode/core/fragment/Demo3Fragment.java

Lines changed: 0 additions & 128 deletions
This file was deleted.

app/src/main/java/com/blankj/androidutilcode/core/fragment/FragmentActivity.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ public static void start(Context context) {
3939
context.startActivity(starter);
4040
}
4141

42-
public Fragment rootFragment;
43-
4442
@Override
4543
public void initData(Bundle bundle) {
4644

@@ -60,9 +58,9 @@ public void initView(Bundle savedInstanceState, View view) {
6058
navigation = (BottomNavigationView) findViewById(R.id.navigation_fragment);
6159
navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
6260

63-
mFragments[0] = Demo0Fragment.newInstance();
64-
mFragments[1] = Demo1Fragment.newInstance();
65-
mFragments[2] = Demo2Fragment.newInstance();
61+
mFragments[0] = RootFragment.newInstance();
62+
mFragments[1] = RootFragment.newInstance();
63+
mFragments[2] = RootFragment.newInstance();
6664
FragmentUtils.add(getSupportFragmentManager(), mFragments, R.id.fragment_container, curIndex);
6765
}
6866

0 commit comments

Comments
 (0)