see 11/17 log

Author: Blankj

README-CN.md

@@ -253,7 +253,15 @@ toggleSoftInput              : 切换键盘显示与否状态
 
 > - **定位相关→[LocationUtils.java][location.java]**
  ```
-
+LocationUtils   : LocationUtils构造函数
+isGpsEnabled    : 判断Gps是否可用
+openGpsSettings : 打开Gps设置界面
+init            : 初始化
+getAddress      : 根据经纬度获取地理位置
+getCountryName  : 根据经纬度获取所在国家
+getLocality     : 根据经纬度获取所在地
+getStreet       : 根据经纬度获取所在街道
+removeAndGc     : 移除并gc
  ```
 
 > - **日志相关→[LogUtils.java][log.java]→[Test][log.test]**
@@ -563,6 +571,8 @@ limitations under the License.
 
 [keyboard.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/utils/KeyboardUtils.java
 
+[location.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/utils/LocationUtils.java
+
 [log.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/utils/LogUtils.java
 [log.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/utils/LogUtilsTest.java
 

README.md

@@ -251,6 +251,19 @@ showSoftInput
 toggleSoftInput
  ```
 
+> - **About Location→[LocationUtils.java][location.java]**
+ ```
+LocationUtils
+isGpsEnabled
+openGpsSettings
+init
+getAddress
+getCountryName
+getLocality
+getStreet
+removeAndGc
+ ```
+
 > - **About Log→[LogUtils.java][log.java]→[Test][log.test]**
  ```
 init
@@ -558,6 +571,8 @@ limitations under the License.
 
 [keyboard.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/utils/KeyboardUtils.java
 
+[location.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/utils/LocationUtils.java
+
 [log.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/utils/LogUtils.java
 [log.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/utils/LogUtilsTest.java
 

app/src/main/java/com/blankj/androidutilcode/activities/LocationActivity.java

@@ -19,8 +19,9 @@
  */
 public class LocationActivity extends Activity {
 
-    Context  mContext;
-    TextView tvAboutLocation;
+    Context       mContext;
+    TextView      tvAboutLocation;
+    LocationUtils locationUtils;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -30,16 +31,15 @@ protected void onCreate(Bundle savedInstanceState) {
         tvAboutLocation = (TextView) findViewById(R.id.tv_about_location);
         mContext = this;
 
-        LocationUtils.getInstance(mContext).init(1000, 0, new LocationUtils.OnLocationChangeListener() {
+        locationUtils = new LocationUtils(this);
+        locationUtils.init(100, 0, new LocationUtils.OnLocationChangeListener() {
             @Override
             public void onLocationChanged(Location location) {
-                //得到纬度
                 double latitude = location.getLatitude();
-                //得到经度
                 double longitude = location.getLongitude();
-                tvAboutLocation.setText("getCountryName:" + LocationUtils.getInstance(mContext).getCountryName(latitude, longitude) +
-                        "\ngetLocality:" + LocationUtils.getInstance(mContext).getLocality(latitude, longitude) +
-                        "\ngetStreet:" + LocationUtils.getInstance(mContext).getStreet(latitude, longitude)
+                tvAboutLocation.setText("getCountryName:" + locationUtils.getCountryName(latitude, longitude) +
+                        "\ngetLocality:" + locationUtils.getLocality(latitude, longitude) +
+                        "\ngetStreet:" + locationUtils.getStreet(latitude, longitude)
                 );
             }
 

utilcode/src/main/java/com/blankj/utilcode/utils/LocationUtils.java

@@ -28,46 +28,24 @@
  */
 public class LocationUtils {
 
-    private volatile static LocationUtils uniqueInstance;
-
+    private Context mContext;
     private OnLocationChangeListener mListener;
-
     private MyLocationListener myLocationListener;
-
     private LocationManager mLocationManager;
 
-    private Context mContext;
-
     /**
      * LocationUtils构造函数
      *
      * @param context 上下文
      */
-    private LocationUtils(Context context) {
+    public LocationUtils(Context context) {
         mContext = context;
         mLocationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
         myLocationListener = new MyLocationListener();
     }
 
     /**
-     * 获取单例
-     *
-     * @param context 上下文
-     * @return LocationUtils对象
-     */
-    public static LocationUtils getInstance(Context context) {
-        if (uniqueInstance == null) {
-            synchronized (LocationUtils.class) {
-                if (uniqueInstance == null) {
-                    uniqueInstance = new LocationUtils(context);
-                }
-            }
-        }
-        return uniqueInstance;
-    }
-
-    /**
-     * 判断Gps是否打开
+     * 判断Gps是否可用
      *
      * @return {@code true}: 是<br>{@code false}: 否
      */
@@ -84,7 +62,7 @@ public void openGpsSettings() {
 
     /**
      * 初始化
-     * <p>使用完记得调用{@link #remove()}</p>
+     * <p>使用完记得调用{@link #removeAndGc()}</p>
      * <p>需添加权限 {@code <uses-permission android:name="android.permission.INTERNET"/>}</p>
      * <p>需添加权限 {@code <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>}</p>
      * <p>需添加权限 {@code <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>}</p>
@@ -136,7 +114,7 @@ public Address getAddress(double latitude, double longitude) {
     }
 
     /**
-     * 根据经纬度获取国家的名字
+     * 根据经纬度获取所在国家
      *
      * @param latitude  纬度
      * @param longitude 经度
@@ -160,7 +138,7 @@ public String getLocality(double latitude, double longitude) {
     }
 
     /**
-     * 根据经纬度获取街道名称
+     * 根据经纬度获取所在街道
      *
      * @param latitude  纬度
      * @param longitude 经度
@@ -171,6 +149,18 @@ public String getStreet(double latitude, double longitude) {
         return address == null ? null : address.getAddressLine(0);
     }
 
+    /**
+     * 移除并gc
+     */
+    public void removeAndGc() {
+        if (mLocationManager != null) {
+            mLocationManager.removeUpdates(myLocationListener);
+            mLocationManager = null;
+            myLocationListener = null;
+            System.gc();
+        }
+    }
+
     private class MyLocationListener
             implements LocationListener {
         /**
@@ -225,19 +215,6 @@ public void onProviderDisabled(String provider) {
         }
     }
 
-    /**
-     * 移除
-     * <p>销毁时一定要移除，否则会内存泄漏</p>
-     */
-    public void remove() {
-        if (mLocationManager != null) {
-            mLocationManager.removeUpdates(myLocationListener);
-            mLocationManager = null;
-            myLocationListener = null;
-            System.gc();
-        }
-    }
-
     public interface OnLocationChangeListener {
 
         /**