Skip to content

Commit 6cd9188

Browse files
author
Blankj
committed
See 10/16 log
1 parent 06479b1 commit 6cd9188

11 files changed

Lines changed: 125 additions & 114 deletions

File tree

‎README-CN.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
4343

44-
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.20.4-brightgreen.svg
44+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.21.0-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

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

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ If this project helps you a lot and you want to support the project's developmen
4141

4242
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
4343

44-
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.20.4-brightgreen.svg
44+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.21.0-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

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

‎app/src/main/java/com/blankj/androidutilcode/Config.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,5 @@ public class Config {
3333
CACHE_PATH = Environment.getExternalStorageDirectory().getAbsolutePath();
3434
}
3535
TEST_APK_PATH = CACHE_PATH + FILE_SEP + "test_install.apk";
36-
3736
}
3837
}

‎app/src/main/java/com/blankj/androidutilcode/feature/core/device/DeviceActivity.java‎

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.content.Context;
44
import android.content.Intent;
5+
import android.os.Build;
56
import android.os.Bundle;
67
import android.support.annotation.Nullable;
78
import android.view.View;
@@ -48,17 +49,32 @@ public void initView(Bundle savedInstanceState, View contentView) {
4849
findViewById(R.id.btn_reboot_to_recovery).setOnClickListener(this);
4950
findViewById(R.id.btn_reboot_to_bootloader).setOnClickListener(this);
5051
TextView tvAboutDevice = findViewById(R.id.tv_about_device);
51-
tvAboutDevice.setText(new SpanUtils()
52-
.appendLine("isRoot: " + DeviceUtils.isDeviceRooted())
53-
.appendLine("getSDKVersionName: " + DeviceUtils.getSDKVersionName())
54-
.appendLine("getSDKVersionCode: " + DeviceUtils.getSDKVersionCode())
55-
.appendLine("getAndroidID: " + DeviceUtils.getAndroidID())
56-
.appendLine("getMacAddress: " + DeviceUtils.getMacAddress())
57-
.appendLine("getManufacturer: " + DeviceUtils.getManufacturer())
58-
.appendLine("getModel: " + DeviceUtils.getModel())
59-
.append("getABIs: " + Arrays.asList(DeviceUtils.getABIs()))
60-
.create()
61-
);
52+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
53+
tvAboutDevice.setText(new SpanUtils()
54+
.appendLine("isRoot: " + DeviceUtils.isDeviceRooted())
55+
.appendLine("isAdbEnabled: " + DeviceUtils.isAdbEnabled())
56+
.appendLine("getSDKVersionName: " + DeviceUtils.getSDKVersionName())
57+
.appendLine("getSDKVersionCode: " + DeviceUtils.getSDKVersionCode())
58+
.appendLine("getAndroidID: " + DeviceUtils.getAndroidID())
59+
.appendLine("getMacAddress: " + DeviceUtils.getMacAddress())
60+
.appendLine("getManufacturer: " + DeviceUtils.getManufacturer())
61+
.appendLine("getModel: " + DeviceUtils.getModel())
62+
.append("getABIs: " + Arrays.asList(DeviceUtils.getABIs()))
63+
.create()
64+
);
65+
} else {
66+
tvAboutDevice.setText(new SpanUtils()
67+
.appendLine("isRoot: " + DeviceUtils.isDeviceRooted())
68+
.appendLine("getSDKVersionName: " + DeviceUtils.getSDKVersionName())
69+
.appendLine("getSDKVersionCode: " + DeviceUtils.getSDKVersionCode())
70+
.appendLine("getAndroidID: " + DeviceUtils.getAndroidID())
71+
.appendLine("getMacAddress: " + DeviceUtils.getMacAddress())
72+
.appendLine("getManufacturer: " + DeviceUtils.getManufacturer())
73+
.appendLine("getModel: " + DeviceUtils.getModel())
74+
.append("getABIs: " + Arrays.asList(DeviceUtils.getABIs()))
75+
.create()
76+
);
77+
}
6278
}
6379

6480
@Override

‎config.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ ext {
66
compileSdkVersion: 27,
77
minSdkVersion : 14,
88
targetSdkVersion : 27,
9-
versionCode : 1_020_004,
10-
versionName : '1.20.4.10'// E.g. 1.9.72 => 1,009,072
9+
versionCode : 1_021_000,
10+
versionName : '1.21.0'// E.g. 1.9.72 => 1,009,072
1111
]
1212

1313
versionConfig = [
1414
// plugin
15-
gradle : '3.2.1',
15+
gradle : '3.2.0',
1616
kotlin : '1.2.30',
1717
// lib
1818
support : '27.1.1',
@@ -177,7 +177,7 @@ def configAppDependencies(Project pro) {
177177
// LeakCanary
178178
debugImplementation depConfig.leakcanary.android
179179
releaseImplementation depConfig.leakcanary.android_no_op
180-
// implementation 'com.blankj:utilcode:1.20.3'
180+
// implementation 'com.blankj:utilcode:1.21.0'
181181
}
182182
}
183183

‎update_log.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* `18/10/16` [add] BusUtils, DeviceUtils#isAdbEnabled. Publish v1.21.0.
12
* `18/09/29` [fix] ToastUtils which causes crash in the some devices of Xiaomi. Publish v1.20.4.
23
* `18/09/13` 修复 ToastUtils 在小米手机显示 Toast 带有 App 名，发布 1.20.3
34
* `18/09/12` 修复 KeyBoardUtils#fixAndroidBug5497，完善 ToastUtils，发布 1.20.2

‎utilcode/README-CN.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Gradle:
44
```groovy
5-
implementation 'com.blankj:utilcode:1.20.4'
5+
implementation 'com.blankj:utilcode:1.21.0'
66
```
77

88

@@ -173,6 +173,7 @@ init: 初始化
173173
* ### 设备相关 -> [DeviceUtils.java][device.java] -> [Demo][device.demo]
174174
```
175175
isDeviceRooted : 判断设备是否 rooted
176+
isAdbEnabled : 判断设备 ADB 是否可用
176177
getSDKVersionName: 获取设备系统版本号
177178
getSDKVersionCode: 获取设备系统版本码
178179
getAndroidID : 获取设备 AndroidID

‎utilcode/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Gradle:
44
```groovy
5-
implementation 'com.blankj:utilcode:1.20.4'
5+
implementation 'com.blankj:utilcode:1.21.0'
66
```
77

88

‎utilcode/src/main/java/com/blankj/utilcode/BusTest.java‎

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

‎utilcode/src/main/java/com/blankj/utilcode/util/DeviceUtils.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import android.os.Build;
99
import android.os.PowerManager;
1010
import android.provider.Settings;
11+
import android.support.annotation.RequiresApi;
1112
import android.support.annotation.RequiresPermission;
1213
import android.text.TextUtils;
1314

@@ -51,6 +52,19 @@ public static boolean isDeviceRooted() {
5152
return false;
5253
}
5354

55+
/**
56+
* Return whether ADB is enabled.
57+
*
58+
* @return {@code true}: yes<br>{@code false}: no
59+
*/
60+
@RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR1)
61+
public static boolean isAdbEnabled() {
62+
return Settings.Secure.getInt(
63+
Utils.getApp().getContentResolver(),
64+
Settings.Global.ADB_ENABLED, 0
65+
) > 0;
66+
}
67+
5468
/**
5569
* Return the version name of device's system.
5670
*

0 commit comments

Comments
 (0)