Skip to content

Commit 9584eb5

Browse files
committed
see 03/21 log
1 parent f213c60 commit 9584eb5

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

subutil/src/main/java/com/blankj/subutil/util/LocationUtils.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.blankj.subutil.util;
22

3+
import android.Manifest;
34
import android.annotation.SuppressLint;
5+
import android.content.Context;
46
import android.content.Intent;
57
import android.location.Address;
68
import android.location.Criteria;
@@ -11,14 +13,13 @@
1113
import android.location.LocationProvider;
1214
import android.os.Bundle;
1315
import android.provider.Settings;
16+
import android.support.annotation.RequiresPermission;
1417
import android.util.Log;
1518

1619
import java.io.IOException;
1720
import java.util.List;
1821
import java.util.Locale;
1922

20-
import static android.content.Context.LOCATION_SERVICE;
21-
2223
/**
2324
* <pre>
2425
* author: Blankj
@@ -111,7 +112,7 @@ private LocationUtils() {
111112
* @return {@code true}: 是<br>{@code false}: 否
112113
*/
113114
public static boolean isGpsEnabled() {
114-
LocationManager lm = (LocationManager) Utils.getApp().getSystemService(LOCATION_SERVICE);
115+
LocationManager lm = (LocationManager) Utils.getApp().getSystemService(Context.LOCATION_SERVICE);
115116
return lm != null && lm.isProviderEnabled(LocationManager.GPS_PROVIDER);
116117
}
117118

@@ -121,7 +122,7 @@ public static boolean isGpsEnabled() {
121122
* @return {@code true}: 是<br>{@code false}: 否
122123
*/
123124
public static boolean isLocationEnabled() {
124-
LocationManager lm = (LocationManager) Utils.getApp().getSystemService(LOCATION_SERVICE);
125+
LocationManager lm = (LocationManager) Utils.getApp().getSystemService(Context.LOCATION_SERVICE);
125126
return lm != null
126127
&& (lm.isProviderEnabled(LocationManager.NETWORK_PROVIDER)
127128
|| lm.isProviderEnabled(LocationManager.GPS_PROVIDER)
@@ -151,10 +152,10 @@ public static void openGpsSettings() {
151152
* @param listener 位置刷新的回调接口
152153
* @return {@code true}: 初始化成功<br>{@code false}: 初始化失败
153154
*/
154-
@SuppressLint("MissingPermission")
155+
@RequiresPermission(Manifest.permission.ACCESS_FINE_LOCATION)
155156
public static boolean register(long minTime, long minDistance, OnLocationChangeListener listener) {
156157
if (listener == null) return false;
157-
mLocationManager = (LocationManager) Utils.getApp().getSystemService(LOCATION_SERVICE);
158+
mLocationManager = (LocationManager) Utils.getApp().getSystemService(Context.LOCATION_SERVICE);
158159
if (mLocationManager == null
159160
|| (!mLocationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)
160161
&& !mLocationManager.isProviderEnabled(LocationManager.GPS_PROVIDER))) {

update_log.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
* 18/03/20 修复 PermissionUtils 子进程的问题
1+
* 18/03/20 修复 PermissionUtils 子进程的问题,发布 1.13.5 版本
22
* 18/03/16 新增 gradle 插件来格式化 README
33
* 18/03/14 修复 KeyboardUtils#getContentViewInvisibleHeight,发布 1.13.4 版本
44
* 18/03/10 完善 Utils#installAppSilent 和 DeviceUtils#getMacAddress,发布 1.13.3 版本

0 commit comments

Comments
 (0)