Skip to content

Commit 5bc8b85

Browse files
committed
see 03/11 log
1 parent ec0da06 commit 5bc8b85

File tree

5 files changed

+16
-14
lines changed

5 files changed

+16
-14
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android:
77
- tools
88
- platform-tools
99
- tools
10-
- build-tools-26.0.2
11-
- android-26
10+
- build-tools-27.0.0
11+
- android-27
1212

1313
licenses:
1414
- 'android-sdk-license-.+'

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ task clean(type: Delete) {
3030

3131
ext {
3232
// Sdk and tools
33-
compile_sdk_version = 26
34-
build_tools_version = '26.0.0'
33+
compile_sdk_version = 27
34+
build_tools_version = '27.0.0'
3535
min_sdk_version = 14
36-
target_sdk_version = 26
36+
target_sdk_version = 27
3737

3838
version_code = 1_013_003
3939
version_name = '1.13.3'// E.g 1.9.72 => 1,009,072

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ public static String getMacAddress() {
113113
@SuppressLint({"HardwareIds", "MissingPermission"})
114114
private static String getMacAddressByWifiInfo() {
115115
try {
116-
@SuppressLint("WifiManagerLeak")
117-
WifiManager wifi = (WifiManager) Utils.getApp().getSystemService(Context.WIFI_SERVICE);
116+
Context context = Utils.getApp().getApplicationContext();
117+
WifiManager wifi = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
118118
if (wifi != null) {
119119
WifiInfo info = wifi.getConnectionInfo();
120120
if (info != null) return info.getMacAddress();
@@ -197,8 +197,9 @@ private static String getMacAddressByFile() {
197197
if (name != null) {
198198
result = ShellUtils.execCmd("cat /sys/class/net/" + name + "/address", false);
199199
if (result.result == 0) {
200-
if (result.successMsg != null) {
201-
return result.successMsg;
200+
String address = result.successMsg;
201+
if (address != null && address.length() > 0) {
202+
return address;
202203
}
203204
}
204205
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ public static String getForegroundProcessName() {
6464
Log.i("ProcessUtils", list.toString());
6565
if (list.size() <= 0) {
6666
Log.i("ProcessUtils",
67-
"getForegroundProcessName() called" + ": 无\"有权查看使用权限的应用\"选项");
67+
"getForegroundProcessName: noun of access to usage information.");
6868
return null;
6969
}
70-
try {// 有"有权查看使用权限的应用"选项
70+
try {// Access to usage information.
7171
ApplicationInfo info =
7272
pm.getApplicationInfo(Utils.getApp().getPackageName(), 0);
7373
AppOpsManager aom =
@@ -82,7 +82,8 @@ public static String getForegroundProcessName() {
8282
if (aom.checkOpNoThrow(AppOpsManager.OPSTR_GET_USAGE_STATS,
8383
info.uid,
8484
info.packageName) != AppOpsManager.MODE_ALLOWED) {
85-
Log.i("ProcessUtils", "没有打开\"有权查看使用权限的应用\"选项");
85+
Log.i("ProcessUtils",
86+
"getForegroundProcessName: refuse to device usage stats.");
8687
return null;
8788
}
8889
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public final class Utils {
3434
@SuppressLint("StaticFieldLeak")
3535
private static Application sApplication;
3636

37-
static LinkedList<Activity> sActivityList = new LinkedList<>();
37+
private static LinkedList<Activity> sActivityList = new LinkedList<>();
3838

3939
private static ActivityLifecycleCallbacks mCallbacks = new ActivityLifecycleCallbacks() {
4040
@Override
@@ -84,7 +84,7 @@ private Utils() {
8484
* @param context context
8585
*/
8686
public static void init(@NonNull final Context context) {
87-
Utils.sApplication = ((Application) context.getApplicationContext());
87+
Utils.sApplication = (Application) context.getApplicationContext();
8888
Utils.sApplication.registerActivityLifecycleCallbacks(mCallbacks);
8989
}
9090

0 commit comments

Comments
 (0)