Skip to content

Commit 21e683f

Browse files
committed
see 10/11 log
1 parent c5fc08b commit 21e683f

File tree

9 files changed

+459
-104
lines changed

9 files changed

+459
-104
lines changed

README-CN.md

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -407,19 +407,21 @@ getReplaceAll : 替换所有正则匹配的部分
407407

408408
* ### 屏幕相关→[ScreenUtils.java][screen.java]
409409
```
410-
getScreenWidth : 获取屏幕的宽度(单位:px)
411-
getScreenHeight : 获取屏幕的高度(单位:px)
412-
setFullScreen : 设置屏幕为全屏
413-
setLandscape : 设置屏幕为横屏
414-
setPortrait : 设置屏幕为竖屏
415-
isLandscape : 判断是否横屏
416-
isPortrait : 判断是否竖屏
417-
getScreenRotation: 获取屏幕旋转角度
418-
screenShot : 截屏
419-
isScreenLock : 判断是否锁屏
420-
setSleepDuration : 设置进入休眠时长
421-
getSleepDuration : 获取进入休眠时长
422-
isTablet : 判断是否是平板
410+
getScreenWidth : 获取屏幕的宽度(单位:px)
411+
getScreenHeight : 获取屏幕的高度(单位:px)
412+
getScreenDensity : 获取屏幕密度
413+
getScreenDensityDpi: 获取屏幕密度DPI
414+
setFullScreen : 设置屏幕为全屏
415+
setLandscape : 设置屏幕为横屏
416+
setPortrait : 设置屏幕为竖屏
417+
isLandscape : 判断是否横屏
418+
isPortrait : 判断是否竖屏
419+
getScreenRotation : 获取屏幕旋转角度
420+
screenShot : 截屏
421+
isScreenLock : 判断是否锁屏
422+
setSleepDuration : 设置进入休眠时长
423+
getSleepDuration : 获取进入休眠时长
424+
isTablet : 判断是否是平板
423425
```
424426

425427
* ### SD卡相关→[SDCardUtils.java][sdcard.java][Demo][sdcard.demo]
@@ -610,7 +612,7 @@ getComments : 获取压缩文件中的注释链表
610612

611613
Gradle:
612614
``` groovy
613-
compile 'com.blankj:utilcode:1.9.2'
615+
compile 'com.blankj:utilcode:1.9.3'
614616
```
615617

616618

@@ -633,7 +635,7 @@ Utils.init(application);
633635

634636
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
635637

636-
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.2-brightgreen.svg
638+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.3-brightgreen.svg
637639
[auc]: https://github.com/Blankj/AndroidUtilCode
638640

639641
[apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,8 @@ getReplaceAll
409409
```
410410
getScreenWidth
411411
getScreenHeight
412+
getScreenDensity
413+
getScreenDensityDpi
412414
setFullScreen
413415
setLandscape
414416
setPortrait
@@ -610,7 +612,7 @@ getComments
610612

611613
Gradle:
612614
``` groovy
613-
compile 'com.blankj:utilcode:1.9.2'
615+
compile 'com.blankj:utilcode:1.9.3'
614616
```
615617

616618

@@ -633,7 +635,7 @@ Utils.init(application);
633635

634636
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
635637

636-
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.2-brightgreen.svg
638+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.3-brightgreen.svg
637639
[auc]: https://github.com/Blankj/AndroidUtilCode
638640

639641
[apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ public void initView(Bundle savedInstanceState, View view) {
5858
navigation = (BottomNavigationView) findViewById(R.id.navigation_fragment);
5959
navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
6060

61-
mFragments[0] = RootFragment.newInstance();
62-
mFragments[1] = RootFragment.newInstance();
63-
mFragments[2] = RootFragment.newInstance();
61+
mFragments[0] = Root0Fragment.newInstance();
62+
mFragments[1] = Root1Fragment.newInstance();
63+
mFragments[2] = Root2Fragment.newInstance();
6464
FragmentUtils.add(getSupportFragmentManager(), mFragments, R.id.fragment_container, curIndex);
6565
}
6666

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
package com.blankj.androidutilcode.core.fragment;
2+
3+
import android.graphics.Color;
4+
import android.os.Build;
5+
import android.os.Bundle;
6+
import android.support.v4.app.Fragment;
7+
import android.transition.Fade;
8+
import android.view.View;
9+
import android.widget.ImageView;
10+
import android.widget.TextView;
11+
12+
import com.blankj.androidutilcode.R;
13+
import com.blankj.androidutilcode.base.BaseFragment;
14+
import com.blankj.utilcode.util.FragmentUtils;
15+
16+
import java.util.Random;
17+
18+
/**
19+
* <pre>
20+
* author: Blankj
21+
* blog : http://blankj.com
22+
* time : 17/02/02
23+
* desc :
24+
* </pre>
25+
*/
26+
public class Root0Fragment extends BaseFragment
27+
implements FragmentUtils.OnBackClickListener {
28+
29+
ImageView ivSharedElement;
30+
TextView tvAboutFragment;
31+
32+
public static Root0Fragment newInstance() {
33+
Bundle args = new Bundle();
34+
Root0Fragment fragment = new Root0Fragment();
35+
fragment.setArguments(args);
36+
return fragment;
37+
}
38+
39+
@Override
40+
public void initData(Bundle bundle) {
41+
42+
}
43+
44+
@Override
45+
public int bindLayout() {
46+
return R.layout.fragment_root;
47+
}
48+
49+
@Override
50+
public void initView(Bundle savedInstanceState, View view) {
51+
Random random = new Random();
52+
FragmentUtils.setBackgroundColor(this, Color.rgb(random.nextInt(256), random.nextInt(256), random.nextInt(256)));
53+
view.findViewById(R.id.btn_show_about_fragment).setOnClickListener(this);
54+
view.findViewById(R.id.btn_add).setOnClickListener(this);
55+
view.findViewById(R.id.btn_add_hide).setOnClickListener(this);
56+
view.findViewById(R.id.btn_add_hide_stack).setOnClickListener(this);
57+
view.findViewById(R.id.btn_add).setOnClickListener(this);
58+
view.findViewById(R.id.btn_add_show).setOnClickListener(this);
59+
view.findViewById(R.id.btn_add_child).setOnClickListener(this);
60+
view.findViewById(R.id.btn_pop_to_root).setOnClickListener(this);
61+
view.findViewById(R.id.btn_pop_add).setOnClickListener(this);
62+
view.findViewById(R.id.btn_hide_show).setOnClickListener(this);
63+
view.findViewById(R.id.btn_replace).setOnClickListener(this);
64+
ivSharedElement = (ImageView) view.findViewById(R.id.iv_shared_element);
65+
tvAboutFragment = (TextView) view.findViewById(R.id.tv_about_fragment);
66+
}
67+
68+
@Override
69+
public void doBusiness() {
70+
71+
}
72+
73+
@Override
74+
public void onWidgetClick(View view) {
75+
tvAboutFragment.setText("");
76+
switch (view.getId()) {
77+
case R.id.btn_show_about_fragment:
78+
tvAboutFragment.setText("top: " + FragmentUtils.getSimpleName(FragmentUtils.getTop(getFragmentManager()))
79+
+ "\ntopInStack: " + FragmentUtils.getSimpleName(FragmentUtils.getTopInStack(getFragmentManager()))
80+
+ "\ntopShow: " + FragmentUtils.getSimpleName(FragmentUtils.getTopShow(getFragmentManager()))
81+
+ "\ntopShowInStack: " + FragmentUtils.getSimpleName(FragmentUtils.getTopShowInStack(getFragmentManager()))
82+
+ "\n---all of fragments---\n"
83+
+ FragmentUtils.getAllFragments(getFragmentManager()).toString()
84+
+ "\n----------------------\n\n"
85+
+ "---stack top---\n"
86+
+ FragmentUtils.getAllFragmentsInStack(getFragmentManager()).toString()
87+
+ "\n---stack bottom---\n\n"
88+
);
89+
break;
90+
case R.id.btn_add:
91+
FragmentUtils.add(getFragmentManager(),
92+
ChildFragment.newInstance(),
93+
R.id.child_fragment_container,
94+
false,
95+
true);
96+
break;
97+
case R.id.btn_add_hide:
98+
FragmentUtils.add(getFragmentManager(),
99+
ChildFragment.newInstance(),
100+
R.id.fragment_container,
101+
true);
102+
break;
103+
case R.id.btn_add_hide_stack:
104+
FragmentUtils.add(getFragmentManager(),
105+
ChildFragment.newInstance(),
106+
R.id.fragment_container,
107+
true,
108+
true);
109+
break;
110+
// case R.id.btn_add_show:
111+
// FragmentUtils.add(getFragmentManager(),
112+
// addSharedElement(Demo1Fragment.newInstance()),
113+
// R.id.fragment_container,
114+
// false,
115+
// false,
116+
// sharedElement);
117+
// break;
118+
// case R.id.btn_add_child:
119+
// FragmentUtils.add(getChildFragmentManager(),
120+
// ChildFragment.newInstance(),
121+
// R.id.child_fragment_container,
122+
// false,
123+
// true);
124+
// break;
125+
// case R.id.btn_pop_to_root:
126+
// FragmentUtils.popToFragment(getFragmentManager(),
127+
// Demo1Fragment.class,
128+
// true);
129+
// break;
130+
// case R.id.btn_pop_add:
131+
// FragmentUtils.popAddFragment(getFragmentManager(),
132+
// addSharedElement(ChildFragment.newInstance()),
133+
// R.id.fragment_container,
134+
// true,
135+
// sharedElement);
136+
// break;
137+
// case R.id.btn_hide_show:
138+
// Fragment fragment1 = FragmentUtils.findFragment(getFragmentManager(), Demo1Fragment.class);
139+
// if (fragment1 != null) {
140+
// FragmentUtils.showHideFragment(this, fragment1);
141+
// } else {
142+
// ToastUtils.showLong("please add demo1 first!");
143+
// }
144+
// break;
145+
// case R.id.btn_replace:
146+
// ((FragmentActivity) getActivity()).rootFragment = FragmentUtils.replaceFragment(this, addSharedElement(Demo3Fragment.newInstance()), false, sharedElement);
147+
// break;
148+
}
149+
}
150+
151+
private Fragment addSharedElement(Fragment fragment) {
152+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
153+
fragment.setSharedElementEnterTransition(new DetailTransition());
154+
fragment.setEnterTransition(new Fade());
155+
fragment.setSharedElementReturnTransition(new DetailTransition());
156+
}
157+
return fragment;
158+
}
159+
160+
@Override
161+
public boolean onBackClick() {
162+
// FragmentUtils.popToFragment(getFragmentManager(), Demo1Fragment.class, true);
163+
return false;
164+
}
165+
}

app/src/main/java/com/blankj/androidutilcode/core/fragment/RootFragment.java renamed to app/src/main/java/com/blankj/androidutilcode/core/fragment/Root1Fragment.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
* desc :
2424
* </pre>
2525
*/
26-
public class RootFragment extends BaseFragment
26+
public class Root1Fragment extends BaseFragment
2727
implements FragmentUtils.OnBackClickListener {
2828

2929
ImageView ivSharedElement;
3030
TextView tvAboutFragment;
3131

32-
public static RootFragment newInstance() {
32+
public static Root1Fragment newInstance() {
3333
Bundle args = new Bundle();
34-
RootFragment fragment = new RootFragment();
34+
Root1Fragment fragment = new Root1Fragment();
3535
fragment.setArguments(args);
3636
return fragment;
3737
}

0 commit comments

Comments
 (0)