提交 ad9f8c4c 编写于 作者: B Blankj

see 07/17 log

上级 f43059d4
......@@ -64,7 +64,6 @@ public class NetworkActivity extends BaseBackActivity {
private void setAboutNetwork() {
tvAboutNetwork.setText("isConnected: " + NetworkUtils.isConnected()
+ "\nisAvailableByPing: " + NetworkUtils.isAvailableByPing()
+ "\ngetDataEnabled: " + NetworkUtils.getDataEnabled()
+ "\nis4G: " + NetworkUtils.is4G()
+ "\ngetWifiEnabled: " + NetworkUtils.getWifiEnabled()
......
......@@ -29,12 +29,12 @@ public class StatusBarImageViewFragment extends BaseFragment {
@Override
public void initView(Bundle savedInstanceState, View view) {
BarUtils.setStatusBar4ImageViewInFragment(mActivity, null);
}
@Override
public void doBusiness(Context context) {
BarUtils.setStatusBar4ImageViewInFragment(mActivity, null);
}
@Override
......
......@@ -6,7 +6,8 @@
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical"
android:padding="@dimen/spacing_16">
android:padding="@dimen/spacing_16"
android:paddingBottom="@dimen/spacing_80">
<Button
android:id="@+id/btn_short_snackbar"
......
......@@ -4,6 +4,7 @@
<dimen name="spacing_8">8dp</dimen>
<dimen name="spacing_16">16dp</dimen>
<dimen name="spacing_24">24dp</dimen>
<dimen name="spacing_80">80dp</dimen>
<dimen name="font_40">40sp</dimen>
<dimen name="font_26">26sp</dimen>
......
* 17/07/17 将NetworkUtils的isAvailableByPing函数新增ip参数
* 17/07/14 将FragmentUtils的FragmentNode置为public
* 17/07/11 将不常用的工具类放在subutil中
* 17/07/10 新增subutil库
......
......@@ -75,11 +75,28 @@ public final class NetworkUtils {
/**
* 判断网络是否可用
* <p>需添加权限 {@code <uses-permission android:name="android.permission.INTERNET"/>}</p>
* <p>需要异步ping,如果ping不通就说明网络不可用</p>
* <p>ping的ip为阿里巴巴公共ip: 223.5.5.5</p>
*
* @return {@code true}: 可用<br>{@code false}: 不可用
*/
public static boolean isAvailableByPing() {
ShellUtils.CommandResult result = ShellUtils.execCmd("ping -c 1 -w 1 223.5.5.5", false);
return isAvailableByPing();
}
/**
* 判断网络是否可用
* <p>需添加权限 {@code <uses-permission android:name="android.permission.INTERNET"/>}</p>
* <p>需要异步ping,如果ping不通就说明网络不可用</p>
*
* @param ip ip地址(自己服务器ip),如果为空,ip为阿里巴巴公共ip
* @return {@code true}: 可用<br>{@code false}: 不可用
*/
public static boolean isAvailableByPing(String ip) {
if (ip == null || ip.length() <= 0) {
ip = "223.5.5.5";// 阿里巴巴公共ip
}
ShellUtils.CommandResult result = ShellUtils.execCmd(String.format("ping -c 1 %s", ip), false);
boolean ret = result.result == 0;
if (result.errorMsg != null) {
Log.d("NetworkUtils", "isAvailableByPing() called" + result.errorMsg);
......
......@@ -39,7 +39,7 @@ public class TestUtils {
Utils.init(RuntimeEnvironment.application);
}
// @Test
// @Test
public void readme2Eng() throws Exception {
formatCN();
File readmeCN = new File(new File(System.getProperty("user.dir")).getAbsolutePath() + FILE_SEP + "README-CN.md");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册