see 11/13 log

Author: Blankj

CHANGELOG.md

@@ -1,3 +1,4 @@
+* `20/11/13` [add] Fix MessengerUtils ANR. Add NetworkUtils#getWifiScanResult, [add|remove]OnWifiChangedConsumer. Publish v1.30.5.
 * `20/10/29` [add] Fix MessengerUtils startService IllegalStateException. Publish v1.30.4.
 * `20/10/28` [add] Fix BusUtils ConcurrentModificationException. Publish v1.30.3.
 * `20/10/27` [add] Fix AppUtils#getAppSignatures. Add DeviceUtils#isDevelopmentSettingsEnabled. Publish v1.30.2.

buildSrc/src/main/groovy/Config.groovy

@@ -14,8 +14,8 @@ class Config {
  static compileSdkVersion = 29
  static minSdkVersion = 14
  static targetSdkVersion = 29
- static versionCode = 1_030_004
- static versionName = '1.30.4'// E.g. 1.9.72 => 1,009,072
+ static versionCode = 1_030_005
+ static versionName = '1.30.5'// E.g. 1.9.72 => 1,009,072
 
  // lib version
  static gradlePluginVersion = '3.5.0'
@@ -53,7 +53,7 @@ class Config {
 
  // 上传新版本插件更新 pluginPath 中的版本号，并设置 isApply = false
  // 通过 mavenLocal 上传本地版本，设置 isApply = true 即可应用插件来调试，最后通过 bintrayUpload 来发布插件
- plugin_api : new DepConfig(isApply: true, useLocal: false, pluginPath: "com.blankj:api-gradle-plugin:latest.release", pluginId: "com.blankj.api"),
+ plugin_api : new DepConfig(isApply: true, useLocal: false, pluginPath: "com.blankj:api-gradle-plugin:1.5", pluginId: "com.blankj.api"),
  //./gradlew clean :plugin_api-gradle-plugin:mavenLocal // 上传到本地 mavenLocal
  //./gradlew clean :plugin_api-gradle-plugin:bintrayUpload // 上传到 jcenter
  plugin_bus : new DepConfig(isApply: true, useLocal: false, pluginPath: "com.blankj:bus-gradle-plugin:2.6", pluginId: "com.blankj.bus"),

feature/utilcode/pkg/src/main/AndroidManifest.xml

@@ -18,6 +18,7 @@
  <uses-permission android:name="android.permission.FLASHLIGHT" />
 
  <!-- network -->
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
  <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/network/NetworkActivity.kt

@@ -2,13 +2,17 @@ package com.blankj.utilcode.pkg.feature.network
 
 import android.content.Context
 import android.content.Intent
+import android.net.wifi.ScanResult
+import android.net.wifi.WifiManager
 import android.os.Bundle
 import android.view.View
 import com.blankj.common.activity.CommonActivity
+import com.blankj.common.helper.PermissionHelper
 import com.blankj.common.item.CommonItem
 import com.blankj.common.item.CommonItemClick
 import com.blankj.common.item.CommonItemSwitch
 import com.blankj.common.item.CommonItemTitle
+import com.blankj.utilcode.constant.PermissionConstants
 import com.blankj.utilcode.pkg.R
 import com.blankj.utilcode.util.*
 
@@ -24,12 +28,24 @@ class NetworkActivity : CommonActivity(), NetworkUtils.OnNetworkStatusChangedLis
 
  companion object {
  fun start(context: Context) {
- val starter = Intent(context, NetworkActivity::class.java)
- context.startActivity(starter)
+ PermissionHelper.request(context, object : PermissionUtils.SimpleCallback {
+ override fun onGranted() {
+ val starter = Intent(context, NetworkActivity::class.java)
+ context.startActivity(starter)
+ }
+
+ override fun onDenied() {
+ }
+ }, PermissionConstants.LOCATION)
  }
  }
 
  private lateinit var itemsTask: ThreadUtils.SimpleTask<List<CommonItem<*>>>
+ private lateinit var wifiScanResultItem: CommonItemTitle
+ private val consumer = Utils.Consumer<NetworkUtils.WifiScanResults> { t ->
+ wifiScanResultItem.setContent(scanResults2String(t.filterResults))
+ wifiScanResultItem.update()
+ }
 
  override fun bindTitleRes(): Int {
  return R.string.demo_network
@@ -51,6 +67,7 @@ class NetworkActivity : CommonActivity(), NetworkUtils.OnNetworkStatusChangedLis
 
  override fun bindItems(): List<CommonItem<*>> {
  if (ThreadUtils.isMainThread()) return arrayListOf()
+ wifiScanResultItem = CommonItemTitle("getWifiScanResult", scanResults2String(NetworkUtils.getWifiScanResult().filterResults))
  return CollectionUtils.newArrayList(
  CommonItemTitle("isConnected", NetworkUtils.isConnected().toString()),
  CommonItemTitle("getMobileDataEnabled", NetworkUtils.getMobileDataEnabled().toString()),
@@ -72,10 +89,19 @@ class NetworkActivity : CommonActivity(), NetworkUtils.OnNetworkStatusChangedLis
  CommonItemTitle("isWifiAvailable", NetworkUtils.isWifiAvailable().toString()),
  CommonItemTitle("isAvailable", NetworkUtils.isAvailable().toString()),
  CommonItemTitle("getBaiduDomainAddress", NetworkUtils.getDomainAddress("baidu.com")),
+ wifiScanResultItem,
 
  CommonItemSwitch(
  R.string.network_wifi_enabled,
- { NetworkUtils.getWifiEnabled() },
+ {
+ val wifiEnabled = NetworkUtils.getWifiEnabled()
+ if (wifiEnabled) {
+ NetworkUtils.addOnWifiChangedConsumer(consumer)
+ } else {
+ NetworkUtils.removeOnWifiChangedConsumer(consumer)
+ }
+ wifiEnabled
+ },
  {
  NetworkUtils.setWifiEnabled(it)
  ThreadUtils.executeByIo(getItemsTask())
@@ -112,5 +138,14 @@ class NetworkActivity : CommonActivity(), NetworkUtils.OnNetworkStatusChangedLis
  super.onDestroy()
  ThreadUtils.cancel(itemsTask)
  NetworkUtils.unregisterNetworkStatusChangedListener(this)
+ NetworkUtils.removeOnWifiChangedConsumer(consumer)
+ }
+
+ private fun scanResults2String(results: List<ScanResult>): String {
+ val sb: StringBuilder = StringBuilder()
+ for (result in results) {
+ sb.append(String.format("${result.SSID}, Level: ${WifiManager.calculateSignalLevel(result.level, 4)}\n"))
+ }
+ return sb.toString()
  }
 }

lib/subutil/src/main/java/com/blankj/subutil/util/BatteryUtils.java

@@ -76,7 +76,6 @@ private static BatteryChangedReceiver getInstance() {
  void registerListener(final OnBatteryStatusChangedListener listener) {
  if (listener == null) return;
  ThreadUtils.runOnUiThread(new Runnable() {
- @SuppressLint("MissingPermission")
  @Override
  public void run() {
  int preSize = mListeners.size();
@@ -109,7 +108,6 @@ public void run() {
  });
  }
 
- @SuppressLint("MissingPermission")
  @Override
  public void onReceive(Context context, final Intent intent) {
  if (Intent.ACTION_BATTERY_CHANGED.equals(intent.getAction())) {

lib/utilcode/README-CN.md

@@ -2,10 +2,10 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.30.4'
+implementation 'com.blankj:utilcode:1.30.5'
 
 // if u use AndroidX, use the following
-implementation 'com.blankj:utilcodex:1.30.4'
+implementation 'com.blankj:utilcodex:1.30.5'
 ```
 
 
@@ -721,6 +721,9 @@ getServerAddressByWifi : 根据 WiFi 获取服务端 IP 地址
 registerNetworkStatusChangedListener : 注册网络状态改变监听器
 isRegisteredNetworkStatusChangedListener: 判断是否注册网络状态改变监听器
 unregisterNetworkStatusChangedListener : 注销网络状态改变监听器
+getWifiScanResult : 获取 WIFI 列表
+addOnWifiChangedConsumer : 增加 WIFI 改变监听
+removeOnWifiChangedConsumer : 移除 WIFI 改变监听
 ```
 
 * ### 通知相关 -> [NotificationUtils.java][notification.java] -> [Demo][notification.demo]

lib/utilcode/README.md

@@ -2,10 +2,10 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.30.4'
+implementation 'com.blankj:utilcode:1.30.5'
 
 // if u use AndroidX, use the following
-implementation 'com.blankj:utilcodex:1.30.4'
+implementation 'com.blankj:utilcodex:1.30.5'
 ```
 
 
@@ -721,6 +721,9 @@ getServerAddressByWifi
 registerNetworkStatusChangedListener
 isRegisteredNetworkStatusChangedListener
 unregisterNetworkStatusChangedListener
+getWifiScanResult
+addOnWifiChangedConsumer
+removeOnWifiChangedConsumer
 ```
 
 * ### About Notification -> [NotificationUtils.java][notification.java] -> [Demo][notification.demo]

lib/utilcode/src/main/java/com/blankj/utilcode/util/CrashUtils.java

@@ -30,7 +30,6 @@ private CrashUtils() {
  /**
  * Initialization.
  */
- @SuppressLint("MissingPermission")
  public static void init() {
  init("");
  }

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

@@ -113,7 +113,7 @@ public static String getAndroidID() {
  *
  * @return the MAC address
  */
- @RequiresPermission(allOf = {ACCESS_WIFI_STATE, INTERNET, CHANGE_WIFI_STATE})
+ @RequiresPermission(allOf = {ACCESS_WIFI_STATE, CHANGE_WIFI_STATE})
  public static String getMacAddress() {
  String macAddress = getMacAddress((String[]) null);
  if (!TextUtils.isEmpty(macAddress) || getWifiEnabled()) return macAddress;
@@ -151,7 +151,7 @@ private static void setWifiEnabled(final boolean enabled) {
  *
  * @return the MAC address
  */
- @RequiresPermission(allOf = {ACCESS_WIFI_STATE, INTERNET})
+ @RequiresPermission(allOf = {ACCESS_WIFI_STATE})
  public static String getMacAddress(final String... excepts) {
  String macAddress = getMacAddressByNetworkInterface();
  if (isAddressNotInExcepts(macAddress, excepts)) {
@@ -190,14 +190,15 @@ private static boolean isAddressNotInExcepts(final String address, final String.
  return true;
  }
 
- @SuppressLint({"MissingPermission", "HardwareIds"})
+ @RequiresPermission(ACCESS_WIFI_STATE)
  private static String getMacAddressByWifiInfo() {
  try {
  final WifiManager wifi = (WifiManager) Utils.getApp()
  .getApplicationContext().getSystemService(WIFI_SERVICE);
  if (wifi != null) {
  final WifiInfo info = wifi.getConnectionInfo();
  if (info != null) {
+ @SuppressLint("HardwareIds")
  String macAddress = info.getMacAddress();
  if (!TextUtils.isEmpty(macAddress)) {
  return macAddress;
@@ -412,7 +413,6 @@ public static boolean isDevelopmentSettingsEnabled() {
  *
  * @return the unique device id
  */
- @SuppressLint({"MissingPermission", "HardwareIds"})
  public static String getUniqueDeviceId() {
  return getUniqueDeviceId("", true);
  }
@@ -426,7 +426,6 @@ public static String getUniqueDeviceId() {
  * @param prefix The prefix of the unique device id.
  * @return the unique device id
  */
- @SuppressLint({"MissingPermission", "HardwareIds"})
  public static String getUniqueDeviceId(String prefix) {
  return getUniqueDeviceId(prefix, true);
  }
@@ -440,7 +439,6 @@ public static String getUniqueDeviceId(String prefix) {
  * @param useCache True to use cache, false otherwise.
  * @return the unique device id
  */
- @SuppressLint({"MissingPermission", "HardwareIds"})
  public static String getUniqueDeviceId(boolean useCache) {
  return getUniqueDeviceId("", useCache);
  }
@@ -455,7 +453,6 @@ public static String getUniqueDeviceId(boolean useCache) {
  * @param useCache True to use cache, false otherwise.
  * @return the unique device id
  */
- @SuppressLint({"MissingPermission", "HardwareIds"})
  public static String getUniqueDeviceId(String prefix, boolean useCache) {
  if (!useCache) {
  return getUniqueDeviceIdReal(prefix);
@@ -486,7 +483,7 @@ private static String getUniqueDeviceIdReal(String prefix) {
  return saveUdid(prefix + 9, "");
  }
 
- @SuppressLint({"MissingPermission", "HardwareIds"})
+ @RequiresPermission(allOf = {ACCESS_WIFI_STATE, INTERNET, CHANGE_WIFI_STATE})
  public static boolean isSameDevice(final String uniqueDeviceId) {
  // {prefix}{type}{32id}
  if (TextUtils.isEmpty(uniqueDeviceId) && uniqueDeviceId.length() < 33) return false;