Merge pull request #778 from Blankj/1.22.9

1.22.9

Author: Blankj

CHANGELOG.md

@@ -1,3 +1,6 @@
+* `18/12/29` [add] AntiShakeUtils and VibrateUtils. Publish v1.22.9.
+* `18/12/28` [fix] ToastUtils show behind the dialog when close notification.
+* `18/12/27` [fix] LogUtils print StringBuilder failed.
 * `18/12/24` [fix] Utils$ActivityLifecycleImpl.consumeOnActivityDestroyedListener ConcurrentModificationException. Publish v1.22.7.
 * `18/12/22` [fix] AdaptScreenUtils#pt2px don't work when start webview. Publish v1.22.6.
 * `18/12/21` [add] LogUtils support print Map, Collection and Object to String.

README-CN.md

@@ -41,7 +41,7 @@
 
 [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
 
-[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.7-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.9-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

README.md

@@ -41,7 +41,7 @@ If this project helps you a lot and you want to support the project's developmen
 
 [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
 
-[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.7-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.9-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

bus-gradle-plugin/project.properties

@@ -5,8 +5,8 @@ ext {
     compileSdkVersion = 27
     minSdkVersion = 14
     targetSdkVersion = 27
-    versionCode = 1_022_007
-    versionName = '1.22.7'// E.g. 1.9.72 => 1,009,072
+    versionCode = 1_022_009
+    versionName = '1.22.9'// E.g. 1.9.72 => 1,009,072
 
     bus = [
             isDebug: false,

config.gradle

@@ -15,5 +15,5 @@ dependencies {
     api dep.free_proguard
     api 'com.r0adkll:slidableactivity:2.0.5'
     compileOnly dep.leakcanary.android_no_op
-//    api 'com.blankj:utilcode:1.22.7'
+//    api 'com.blankj:utilcode:1.22.9'
 }

lib/base/build.gradle

@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.view.LayoutInflater
 import android.view.View
+import com.blankj.utilcode.util.AntiShakeUtils
 
 /**
  * ```
@@ -18,16 +19,6 @@ abstract class BaseActivity : AppCompatActivity(), IBaseView {
 
     protected lateinit var mContentView: View
     protected lateinit var mActivity: Activity
-    private var lastClick: Long = 0// the time of last click
-    private val isFastClick: Boolean
-        get() {
-            val now = System.currentTimeMillis()
-            if (now - lastClick >= 200) {
-                lastClick = now
-                return false
-            }
-            return true
-        }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         mActivity = this
@@ -45,6 +36,8 @@ abstract class BaseActivity : AppCompatActivity(), IBaseView {
     }
 
     override fun onClick(view: View) {
-        if (!isFastClick) onWidgetClick(view)
+        if (AntiShakeUtils.isValid(view, 200)) {
+            onWidgetClick(view)
+        }
     }
 }

lib/base/src/main/java/com/blankj/lib/base/BaseActivity.kt

@@ -24,6 +24,6 @@ public static void init() {
 
     @Test
     public void test() throws Exception {
-        System.out.println(-1 << 2);
+
     }
 }

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

@@ -21,7 +21,7 @@ public class DialogHelper {
 
     public static void showRationaleDialog(final ShouldRequest shouldRequest) {
         Activity topActivity = ActivityUtils.getTopActivity();
-        if (topActivity == null) return;
+        if (topActivity == null || topActivity.isFinishing()) return;
         new AlertDialog.Builder(topActivity)
                 .setTitle(android.R.string.dialog_alert_title)
                 .setMessage(R.string.permission_rationale_message)
@@ -45,7 +45,7 @@ public void onClick(DialogInterface dialog, int which) {
 
     public static void showOpenAppSettingDialog() {
         Activity topActivity = ActivityUtils.getTopActivity();
-        if (topActivity == null) return;
+        if (topActivity == null || topActivity.isFinishing()) return;
         new AlertDialog.Builder(topActivity)
                 .setTitle(android.R.string.dialog_alert_title)
                 .setMessage(R.string.permission_denied_forever_message)