diff --git a/build.gradle b/build.gradle index 6a644395d98994b5439132ff8e303decc5135ff6..2965e8c2bc0de27fecbe99446497e0b8f72c0c86 100644 --- a/build.gradle +++ b/build.gradle @@ -8,6 +8,7 @@ buildscript { dependencies { classpath depConfig.gradle +// classpath depConfig.kotlin_gradle_plugin } } diff --git a/config.gradle b/config.gradle index dac90f94f2c362a0ba3289bb6b45f1885b02aac0..6b1036a93fb14dcb2347f9c49065f6f341ba8115 100644 --- a/config.gradle +++ b/config.gradle @@ -25,22 +25,23 @@ ext { ] depConfig = [ - gradle : "com.android.tools.build:gradle:$versionConfig.gradle", - kotlin : "org.jetbrains.kotlin:kotlin-gradle-plugin:$versionConfig.kotlin", + gradle : "com.android.tools.build:gradle:$versionConfig.gradle", + kotlin_gradle_plugin: "org.jetbrains.kotlin:kotlin-gradle-plugin:$versionConfig.kotlin", - support : [ + support : [ appcompat_v7: "com.android.support:appcompat-v7:$versionConfig.support", design : "com.android.support:design:$versionConfig.support", ], - leakcanary : [ + kotlin_stdlib_jdk7 : "org.jetbrains.kotlin:kotlin-stdlib-jdk7", + leakcanary : [ android : "com.squareup.leakcanary:leakcanary-android:$versionConfig.leakcanary", android_no_op: "com.squareup.leakcanary:leakcanary-android-no-op:$versionConfig.leakcanary", ], - gson : "com.google.code.gson:gson:$versionConfig.gson", - glide : "com.github.bumptech.glide:glide:$versionConfig.glide", + gson : "com.google.code.gson:gson:$versionConfig.gson", + glide : "com.github.bumptech.glide:glide:$versionConfig.glide", - junit : "junit:junit:$versionConfig.junit", - robolectric: "org.robolectric:robolectric:$versionConfig.robolectric", + junit : "junit:junit:$versionConfig.junit", + robolectric : "org.robolectric:robolectric:$versionConfig.robolectric", ] configAndroidDomain = this.&configAndroidDomain diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/NetworkUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/NetworkUtils.java index 57d344d8a94dc47805237dd0aadacbb0dd5c0c77..999cc173c2f63dc07a8abc8a404bbd00aa2bab3c 100644 --- a/utilcode/src/main/java/com/blankj/utilcode/util/NetworkUtils.java +++ b/utilcode/src/main/java/com/blankj/utilcode/util/NetworkUtils.java @@ -206,16 +206,8 @@ public final class NetworkUtils { public static void setWifiEnabled(final boolean enabled) { @SuppressLint("WifiManagerLeak") WifiManager manager = (WifiManager) Utils.getApp().getSystemService(Context.WIFI_SERVICE); - if (manager == null) return; - if (enabled) { - if (!manager.isWifiEnabled()) { - manager.setWifiEnabled(true); - } - } else { - if (manager.isWifiEnabled()) { - manager.setWifiEnabled(false); - } - } + if (manager == null || enabled == manager.isWifiEnabled()) return; + manager.setWifiEnabled(enabled); } /**