Skip to content

Commit ad9f8c4

Browse files
committed
see 07/17 log
1 parent f43059d commit ad9f8c4

File tree

7 files changed

+25
-6
lines changed

7 files changed

+25
-6
lines changed

app/src/main/java/com/blankj/androidutilcode/activity/NetworkActivity.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ public void onWidgetClick(View view) {
6464

6565
private void setAboutNetwork() {
6666
tvAboutNetwork.setText("isConnected: " + NetworkUtils.isConnected()
67-
+ "\nisAvailableByPing: " + NetworkUtils.isAvailableByPing()
6867
+ "\ngetDataEnabled: " + NetworkUtils.getDataEnabled()
6968
+ "\nis4G: " + NetworkUtils.is4G()
7069
+ "\ngetWifiEnabled: " + NetworkUtils.getWifiEnabled()

app/src/main/java/com/blankj/androidutilcode/fragment/StatusBarImageViewFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ public int bindLayout() {
2929

3030
@Override
3131
public void initView(Bundle savedInstanceState, View view) {
32-
32+
BarUtils.setStatusBar4ImageViewInFragment(mActivity, null);
3333
}
3434

3535
@Override
3636
public void doBusiness(Context context) {
37-
BarUtils.setStatusBar4ImageViewInFragment(mActivity, null);
37+
3838
}
3939

4040
@Override

app/src/main/res/layout/activity_snackbar.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
android:layout_height="wrap_content"
77
android:gravity="center_horizontal"
88
android:orientation="vertical"
9-
android:padding="@dimen/spacing_16">
9+
android:padding="@dimen/spacing_16"
10+
android:paddingBottom="@dimen/spacing_80">
1011

1112
<Button
1213
android:id="@+id/btn_short_snackbar"

app/src/main/res/values/dimens.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<dimen name="spacing_8">8dp</dimen>
55
<dimen name="spacing_16">16dp</dimen>
66
<dimen name="spacing_24">24dp</dimen>
7+
<dimen name="spacing_80">80dp</dimen>
78

89
<dimen name="font_40">40sp</dimen>
910
<dimen name="font_26">26sp</dimen>

update_log.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* 17/07/17 将NetworkUtils的isAvailableByPing函数新增ip参数
12
* 17/07/14 将FragmentUtils的FragmentNode置为public
23
* 17/07/11 将不常用的工具类放在subutil中
34
* 17/07/10 新增subutil库

utilcode/src/main/java/com/blankj/utilcode/util/NetworkUtils.java

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,28 @@ public static boolean isConnected() {
7575
/**
7676
* 判断网络是否可用
7777
* <p>需添加权限 {@code <uses-permission android:name="android.permission.INTERNET"/>}</p>
78+
* <p>需要异步ping,如果ping不通就说明网络不可用</p>
79+
* <p>ping的ip为阿里巴巴公共ip: 223.5.5.5</p>
7880
*
7981
* @return {@code true}: 可用<br>{@code false}: 不可用
8082
*/
8183
public static boolean isAvailableByPing() {
82-
ShellUtils.CommandResult result = ShellUtils.execCmd("ping -c 1 -w 1 223.5.5.5", false);
84+
return isAvailableByPing();
85+
}
86+
87+
/**
88+
* 判断网络是否可用
89+
* <p>需添加权限 {@code <uses-permission android:name="android.permission.INTERNET"/>}</p>
90+
* <p>需要异步ping,如果ping不通就说明网络不可用</p>
91+
*
92+
* @param ip ip地址(自己服务器ip),如果为空,ip为阿里巴巴公共ip
93+
* @return {@code true}: 可用<br>{@code false}: 不可用
94+
*/
95+
public static boolean isAvailableByPing(String ip) {
96+
if (ip == null || ip.length() <= 0) {
97+
ip = "223.5.5.5";// 阿里巴巴公共ip
98+
}
99+
ShellUtils.CommandResult result = ShellUtils.execCmd(String.format("ping -c 1 %s", ip), false);
83100
boolean ret = result.result == 0;
84101
if (result.errorMsg != null) {
85102
Log.d("NetworkUtils", "isAvailableByPing() called" + result.errorMsg);

utilcode/src/test/java/com/blankj/utilcode/util/TestUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static void init() {
3939
Utils.init(RuntimeEnvironment.application);
4040
}
4141

42-
// @Test
42+
// @Test
4343
public void readme2Eng() throws Exception {
4444
formatCN();
4545
File readmeCN = new File(new File(System.getProperty("user.dir")).getAbsolutePath() + FILE_SEP + "README-CN.md");

0 commit comments

Comments
 (0)