Skip to content

Commit 12a006f

Browse files
committed
see 12/29 log
1 parent 877bbc4 commit 12a006f

File tree

27 files changed

+308
-108
lines changed

27 files changed

+308
-108
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
* `18/12/29` [add] AntiShakeUtils and VibrateUtils. Publish v1.22.9.
2+
* `18/12/28` [fix] ToastUtils show behind the dialog when close notification.
3+
* `18/12/27` [fix] LogUtils print StringBuilder failed.
14
* `18/12/24` [fix] Utils$ActivityLifecycleImpl.consumeOnActivityDestroyedListener ConcurrentModificationException. Publish v1.22.7.
25
* `18/12/22` [fix] AdaptScreenUtils#pt2px don't work when start webview. Publish v1.22.6.
36
* `18/12/21` [add] LogUtils support print Map, Collection and Object to String.

README-CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
4343

44-
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.7-brightgreen.svg
44+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.9-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

4747
[apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ If this project helps you a lot and you want to support the project's developmen
4141

4242
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
4343

44-
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.7-brightgreen.svg
44+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.9-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

4747
[apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

bus-gradle-plugin/project.properties

Lines changed: 0 additions & 6 deletions
This file was deleted.

config.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ ext {
55
compileSdkVersion = 27
66
minSdkVersion = 14
77
targetSdkVersion = 27
8-
versionCode = 1_022_007
9-
versionName = '1.22.7'// E.g. 1.9.72 => 1,009,072
8+
versionCode = 1_022_009
9+
versionName = '1.22.9'// E.g. 1.9.72 => 1,009,072
1010

1111
bus = [
1212
isDebug: false,

lib/base/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ dependencies {
1515
api dep.free_proguard
1616
api 'com.r0adkll:slidableactivity:2.0.5'
1717
compileOnly dep.leakcanary.android_no_op
18-
// api 'com.blankj:utilcode:1.22.7'
18+
// api 'com.blankj:utilcode:1.22.9'
1919
}

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

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import android.os.Bundle
55
import android.support.v7.app.AppCompatActivity
66
import android.view.LayoutInflater
77
import android.view.View
8+
import com.blankj.utilcode.util.AntiShakeUtils
89

910
/**
1011
* ```
@@ -18,16 +19,6 @@ abstract class BaseActivity : AppCompatActivity(), IBaseView {
1819

1920
protected lateinit var mContentView: View
2021
protected lateinit var mActivity: Activity
21-
private var lastClick: Long = 0// the time of last click
22-
private val isFastClick: Boolean
23-
get() {
24-
val now = System.currentTimeMillis()
25-
if (now - lastClick >= 200) {
26-
lastClick = now
27-
return false
28-
}
29-
return true
30-
}
3122

3223
override fun onCreate(savedInstanceState: Bundle?) {
3324
mActivity = this
@@ -45,6 +36,8 @@ abstract class BaseActivity : AppCompatActivity(), IBaseView {
4536
}
4637

4738
override fun onClick(view: View) {
48-
if (!isFastClick) onWidgetClick(view)
39+
if (AntiShakeUtils.isValid(view, 200)) {
40+
onWidgetClick(view)
41+
}
4942
}
5043
}

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

Lines changed: 0 additions & 49 deletions
This file was deleted.

subutil/lib/src/test/java/com/blankj/subutil/util/TestUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ public static void init() {
2424

2525
@Test
2626
public void test() throws Exception {
27-
System.out.println(-1 << 2);
27+
2828
}
2929
}

subutil/pkg/src/main/java/com/blankj/subutil/pkg/helper/DialogHelper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class DialogHelper {
2121

2222
public static void showRationaleDialog(final ShouldRequest shouldRequest) {
2323
Activity topActivity = ActivityUtils.getTopActivity();
24-
if (topActivity == null) return;
24+
if (topActivity == null || topActivity.isFinishing()) return;
2525
new AlertDialog.Builder(topActivity)
2626
.setTitle(android.R.string.dialog_alert_title)
2727
.setMessage(R.string.permission_rationale_message)
@@ -45,7 +45,7 @@ public void onClick(DialogInterface dialog, int which) {
4545

4646
public static void showOpenAppSettingDialog() {
4747
Activity topActivity = ActivityUtils.getTopActivity();
48-
if (topActivity == null) return;
48+
if (topActivity == null || topActivity.isFinishing()) return;
4949
new AlertDialog.Builder(topActivity)
5050
.setTitle(android.R.string.dialog_alert_title)
5151
.setMessage(R.string.permission_denied_forever_message)

utilcode/README-CN.md

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Gradle:
44
```groovy
5-
implementation 'com.blankj:utilcode:1.22.7'
5+
implementation 'com.blankj:utilcode:1.22.9'
66
```
77

88

@@ -35,6 +35,11 @@ pt2Px : pt 转 px
3535
px2Pt : px 转 pt
3636
```
3737

38+
* ### AntiShake 相关 -> [AntiShakeUtils.java][antiShake.java]
39+
```
40+
isValid: 是否有效
41+
```
42+
3843
* ### App 相关 -> [AppUtils.java][app.java] -> [Demo][app.demo]
3944
```
4045
registerAppStatusChangedListener : 注册 App 前后台切换监听器
@@ -799,6 +804,12 @@ file2Uri: file 转 uri
799804
uri2File: uri 转 file
800805
```
801806

807+
* ### 震动相关 -> [VibrateUtils.java][vibrate.java] -> [Demo][demo.demo]
808+
```
809+
vibrate: 震动
810+
cancel : 取消
811+
```
812+
802813
* ### 压缩相关 -> [ZipUtils.java][zip.java] -> [Test][zip.test]
803814
```
804815
zipFiles : 批量压缩文件
@@ -813,11 +824,12 @@ getComments : 获取压缩文件中的注释链表
813824

814825
[activity.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/ActivityUtils.java
815826
[activity.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/ActivityActivity.java
816-
[activity.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/ActivityActivity.java
817827

818828
[adaptScreen.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/AdaptScreenUtils.java
819829
[adaptScreen.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/adaptScreen/AdaptScreenActivity.kt
820830

831+
[antiShake.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/AntiShakeUtils.java
832+
821833
[app.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/AppUtils.java
822834
[app.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/app/AppActivity.java
823835

@@ -943,5 +955,8 @@ getComments : 获取压缩文件中的注释链表
943955

944956
[uri.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/UriUtils.java
945957

958+
[vibrate.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/VibrateUtils.java
959+
[vibrate.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/vibrate/VibrateActivity.java
960+
946961
[zip.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/ZipUtils.java
947962
[zip.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/test/java/com/blankj/utilcode/util/ZipUtilsTest.java

utilcode/README-STATIC-BUS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ apply plugin: "com.blankj.bus"
2727
给 base 模块添加 [AndroidUtilCode](https://github.com/Blankj/AndroidUtilCode) 依赖:
2828

2929
```groovy
30-
api "com.blankj:utilcode:1.22.7"
30+
api "com.blankj:utilcode:1.22.9"
3131
```
3232

3333
比如 module0 中存在的 `Module0Activity.java`,我们通常都是在它内部写一个 `start` 函数来启动它,现在我们给它添加 `@BusUtils.Subscribe` 注解,并给注解的 `name` 赋唯一值,要注意,函数务必要 `public static` 哦:

utilcode/README.md

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Gradle:
44
```groovy
5-
implementation 'com.blankj:utilcode:1.22.7'
5+
implementation 'com.blankj:utilcode:1.22.9'
66
```
77

88

@@ -35,6 +35,11 @@ pt2Px
3535
px2Pt
3636
```
3737

38+
* ### About AntiShake -> [AntiShakeUtils.java][antiShake.java]
39+
```
40+
isValid
41+
```
42+
3843
* ### About App -> [AppUtils.java][app.java] -> [Demo][app.demo]
3944
```
4045
registerAppStatusChangedListener
@@ -799,6 +804,12 @@ file2Uri
799804
uri2File
800805
```
801806

807+
* ### About Vibrate -> [VibrateUtils.java][vibrate.java] -> [Demo][demo.demo]
808+
```
809+
vibrate
810+
cancel
811+
```
812+
802813
* ### About Zip -> [ZipUtils.java][zip.java] -> [Test][zip.test]
803814
```
804815
zipFiles
@@ -813,11 +824,12 @@ getComments
813824

814825
[activity.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/ActivityUtils.java
815826
[activity.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/ActivityActivity.java
816-
[activity.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/ActivityActivity.java
817827

818828
[adaptScreen.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/AdaptScreenUtils.java
819829
[adaptScreen.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/adaptScreen/AdaptScreenActivity.kt
820830

831+
[antiShake.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/AntiShakeUtils.java
832+
821833
[app.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/AppUtils.java
822834
[app.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/app/AppActivity.java
823835

@@ -943,5 +955,8 @@ getComments
943955

944956
[uri.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/UriUtils.java
945957

958+
[vibrate.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/VibrateUtils.java
959+
[vibrate.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/vibrate/VibrateActivity.java
960+
946961
[zip.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/ZipUtils.java
947962
[zip.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/test/java/com/blankj/utilcode/util/ZipUtilsTest.java
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package com.blankj.utilcode.util;
2+
3+
import android.support.annotation.IntRange;
4+
import android.support.annotation.NonNull;
5+
import android.view.View;
6+
7+
/**
8+
* <pre>
9+
* author: blankj
10+
* blog : http://blankj.com
11+
* time : 2018/12/29
12+
* desc : utils about anti shake
13+
* </pre>
14+
*/
15+
public class AntiShakeUtils {
16+
17+
private static final long DEFAULT_DURATION = 200;
18+
private static final int TAG_KEY = 0x7EFFFFFF;
19+
20+
private AntiShakeUtils() {
21+
throw new UnsupportedOperationException("u can't instantiate me...");
22+
}
23+
24+
public static boolean isValid(@NonNull View view) {
25+
return isValid(view, DEFAULT_DURATION);
26+
}
27+
28+
public static boolean isValid(@NonNull View view, @IntRange(from = 0) long duration) {
29+
long curTime = System.currentTimeMillis();
30+
Object tag = view.getTag(TAG_KEY);
31+
view.setTag(TAG_KEY, curTime);
32+
if (!(tag instanceof Long)) return true;
33+
long preTime = (Long) tag;
34+
return curTime - preTime > duration;
35+
}
36+
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,9 @@ public static Bitmap toRound(final Bitmap src,
690690
rectF.inset((width - size) / 2f, (height - size) / 2f);
691691
Matrix matrix = new Matrix();
692692
matrix.setTranslate(rectF.left, rectF.top);
693-
matrix.preScale((float) size / width, (float) size / height);
693+
if (width != height) {
694+
matrix.preScale((float) size / width, (float) size / height);
695+
}
694696
BitmapShader shader = new BitmapShader(src, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP);
695697
shader.setLocalMatrix(matrix);
696698
paint.setShader(shader);

0 commit comments

Comments
 (0)