Merge branch 'master' into androidx

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.2'
@@ -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:1.4", 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/mvp/MvpModel.java

@@ -12,7 +12,7 @@
  *     desc  :
  * </pre>
  */
-public class MvpModel extends BaseModel implements IMvp.Model {
+public class MvpModel extends BaseModel implements MvpMvp.Model {
 
     private int index;
 

feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/mvp/IMvp.java renamed to feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/mvp/MvpMvp.java

@@ -10,7 +10,7 @@
  *     desc  :
  * </pre>
  */
-public interface IMvp {
+public interface MvpMvp {
 
     interface View {
         void setLoadingVisible(boolean visible);

feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/mvp/MvpPresenter.java

@@ -13,7 +13,7 @@
  * </pre>
  */
 public class MvpPresenter extends BasePresenter<MvpView>
-        implements IMvp.Presenter {
+        implements MvpMvp.Presenter {
 
     @Override
     public void onBindView() {

feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/mvp/MvpView.java

@@ -21,7 +21,7 @@
  * </pre>
  */
 public class MvpView extends BaseView<MvpView>
-        implements IMvp.View {
+        implements MvpMvp.View {
 
     private TextView mvpTv;
     private TextView mvpMeasureWidthTv;

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/base/src/main/java/com/blankj/base/mvp/BaseModel.java

@@ -3,8 +3,6 @@
 import android.util.Log;
 
 import androidx.annotation.CallSuper;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
 
 /**
  * <pre>
@@ -16,8 +14,6 @@
  */
 public abstract class BaseModel {
 
-    LiveData<Object> mData = new MutableLiveData<>();
-
     private static final String TAG = BaseView.TAG;
 
     public abstract void onCreate();

lib/base/src/main/java/com/blankj/base/mvp/BasePresenter.java

@@ -70,8 +70,4 @@ public void onDestroy() {
     public boolean isAlive() {
         return isAlive;
     }
-
-    public void getSafeData() {
-        new ViewModelProvider(getView().getActivity(), new ViewModelProvider.NewInstanceFactory()).get(ViewModel.class);
-    }
 }