Skip to content

Commit 07ad520

Browse files
BlankjBlankj
authored
Merge pull request Blankj#759 from Blankj/1.22.4
1.22.4
2 parents e048975 + 81c0ec2 commit 07ad520

File tree

15 files changed

+47
-34
lines changed

15 files changed

+47
-34
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
* `18/12/19` [fix] ToastUtils multi show crash when run API 25. Publish v1.22.4.
2+
* `18/12/18` [fix] ImageUtils recycle ret equals src. Publish v1.22.3.
13
* `18/12/17` [fix] Utils$FileProvider4UtilCode not found. Publish v1.22.3.
24
* `18/12/17` [fix] ToastUtils leak. Publish v1.22.2.
35
* `18/12/09` [add] Component for the project.

‎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.3-brightgreen.svg
44+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.4-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.3-brightgreen.svg
44+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.4-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

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

‎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_003
9-
versionName = '1.22.3'// E.g. 1.9.72 => 1,009,072
8+
versionCode = 1_022_004
9+
versionName = '1.22.4'// 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.3'
18+
// api 'com.blankj:utilcode:1.22.4'
1919
}

‎utilcode/README-CN.md

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

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

88

‎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.3"
30+
api "com.blankj:utilcode:1.22.4"
3131
```
3232

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

‎utilcode/README.md

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

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

88

‎utilcode/lib/src/main/java/com/blankj/utilcode/util/BusUtils.java

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public final class BusUtils {
2525
private static final Object NULL = new Object();
2626
private static final Map<Object, String> BUSES = new ConcurrentHashMap<>();
2727

28-
public static <T> T post(String name, Object... objects) {
28+
public static <T> T post(final String name, final Object... objects) {
2929
if (name == null || name.length() == 0) return null;
3030
Object o = injectShell(name, objects);
3131
if (NULL.equals(o)) {
@@ -35,7 +35,18 @@ public static <T> T post(String name, Object... objects) {
3535
return (T) o;
3636
}
3737

38-
private static Object injectShell(String name, Object[] objects) {
38+
39+
public static void register(final Object bus) {
40+
41+
}
42+
43+
public static void unregister(final Object bus) {
44+
45+
}
46+
47+
48+
49+
private static Object injectShell(final String name, final Object[] objects) {
3950
return NULL;
4051
}
4152

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ public static Bitmap scale(final Bitmap src,
413413
final boolean recycle) {
414414
if (isEmptyBitmap(src)) return null;
415415
Bitmap ret = Bitmap.createScaledBitmap(src, newWidth, newHeight, true);
416-
if (recycle && !src.isRecycled()) src.recycle();
416+
if (recycle && !src.isRecycled() && ret != src) src.recycle();
417417
return ret;
418418
}
419419

@@ -446,7 +446,7 @@ public static Bitmap scale(final Bitmap src,
446446
Matrix matrix = new Matrix();
447447
matrix.setScale(scaleWidth, scaleHeight);
448448
Bitmap ret = Bitmap.createBitmap(src, 0, 0, src.getWidth(), src.getHeight(), matrix, true);
449-
if (recycle && !src.isRecycled()) src.recycle();
449+
if (recycle && !src.isRecycled() && ret != src) src.recycle();
450450
return ret;
451451
}
452452

@@ -487,7 +487,7 @@ public static Bitmap clip(final Bitmap src,
487487
final boolean recycle) {
488488
if (isEmptyBitmap(src)) return null;
489489
Bitmap ret = Bitmap.createBitmap(src, x, y, width, height);
490-
if (recycle && !src.isRecycled()) src.recycle();
490+
if (recycle && !src.isRecycled() && ret != src) src.recycle();
491491
return ret;
492492
}
493493

@@ -558,7 +558,7 @@ public static Bitmap skew(final Bitmap src,
558558
Matrix matrix = new Matrix();
559559
matrix.setSkew(kx, ky, px, py);
560560
Bitmap ret = Bitmap.createBitmap(src, 0, 0, src.getWidth(), src.getHeight(), matrix, true);
561-
if (recycle && !src.isRecycled()) src.recycle();
561+
if (recycle && !src.isRecycled() && ret != src) src.recycle();
562562
return ret;
563563
}
564564

@@ -598,7 +598,7 @@ public static Bitmap rotate(final Bitmap src,
598598
Matrix matrix = new Matrix();
599599
matrix.setRotate(degrees, px, py);
600600
Bitmap ret = Bitmap.createBitmap(src, 0, 0, src.getWidth(), src.getHeight(), matrix, true);
601-
if (recycle && !src.isRecycled()) src.recycle();
601+
if (recycle && !src.isRecycled() && ret != src) src.recycle();
602602
return ret;
603603
}
604604

@@ -704,7 +704,7 @@ public static Bitmap toRound(final Bitmap src,
704704
float radius = center - borderSize / 2f;
705705
canvas.drawCircle(width / 2f, height / 2f, radius, paint);
706706
}
707-
if (recycle && !src.isRecycled()) src.recycle();
707+
if (recycle && !src.isRecycled() && ret != src) src.recycle();
708708
return ret;
709709
}
710710

@@ -784,7 +784,7 @@ public static Bitmap toRoundCorner(final Bitmap src,
784784
paint.setStrokeCap(Paint.Cap.ROUND);
785785
canvas.drawRoundRect(rectF, radius, radius, paint);
786786
}
787-
if (recycle && !src.isRecycled()) src.recycle();
787+
if (recycle && !src.isRecycled() && ret != src) src.recycle();
788788
return ret;
789789
}
790790

@@ -935,7 +935,7 @@ public static Bitmap addReflection(final Bitmap src,
935935
paint.setXfermode(new PorterDuffXfermode(android.graphics.PorterDuff.Mode.DST_IN));
936936
canvas.drawRect(0, srcHeight + REFLECTION_GAP, srcWidth, ret.getHeight(), paint);
937937
if (!reflectionBitmap.isRecycled()) reflectionBitmap.recycle();
938-
if (recycle && !src.isRecycled()) src.recycle();
938+
if (recycle && !src.isRecycled() && ret != src) src.recycle();
939939
return ret;
940940
}
941941

@@ -987,7 +987,7 @@ public static Bitmap addTextWatermark(final Bitmap src,
987987
Rect bounds = new Rect();
988988
paint.getTextBounds(content, 0, content.length(), bounds);
989989
canvas.drawText(content, x, y + textSize, paint);
990-
if (recycle && !src.isRecycled()) src.recycle();
990+
if (recycle && !src.isRecycled() && ret != src) src.recycle();
991991
return ret;
992992
}
993993

@@ -1033,7 +1033,7 @@ public static Bitmap addImageWatermark(final Bitmap src,
10331033
paint.setAlpha(alpha);
10341034
canvas.drawBitmap(watermark, x, y, paint);
10351035
}
1036-
if (recycle && !src.isRecycled()) src.recycle();
1036+
if (recycle && !src.isRecycled() && ret != src) src.recycle();
10371037
return ret;
10381038
}
10391039

@@ -1057,7 +1057,7 @@ public static Bitmap toAlpha(final Bitmap src) {
10571057
public static Bitmap toAlpha(final Bitmap src, final Boolean recycle) {
10581058
if (isEmptyBitmap(src)) return null;
10591059
Bitmap ret = src.extractAlpha();
1060-
if (recycle && !src.isRecycled()) src.recycle();
1060+
if (recycle && !src.isRecycled() && ret != src) src.recycle();
10611061
return ret;
10621062
}
10631063

@@ -1088,7 +1088,7 @@ public static Bitmap toGray(final Bitmap src, final boolean recycle) {
10881088
ColorMatrixColorFilter colorMatrixColorFilter = new ColorMatrixColorFilter(colorMatrix);
10891089
paint.setColorFilter(colorMatrixColorFilter);
10901090
canvas.drawBitmap(src, 0, 0, paint);
1091-
if (recycle && !src.isRecycled()) src.recycle();
1091+
if (recycle && !src.isRecycled() && ret != src) src.recycle();
10921092
return ret;
10931093
}
10941094

@@ -1171,12 +1171,12 @@ public static Bitmap fastBlur(final Bitmap src,
11711171
scaleBitmap = stackBlur(scaleBitmap, (int) radius, recycle);
11721172
}
11731173
if (scale == 1 || isReturnScale) {
1174-
if (recycle && !src.isRecycled()) src.recycle();
1174+
if (recycle && !src.isRecycled() && scaleBitmap != src) src.recycle();
11751175
return scaleBitmap;
11761176
}
11771177
Bitmap ret = Bitmap.createScaledBitmap(scaleBitmap, width, height, true);
11781178
if (!scaleBitmap.isRecycled()) scaleBitmap.recycle();
1179-
if (recycle && !src.isRecycled()) src.recycle();
1179+
if (recycle && !src.isRecycled() && ret != src) src.recycle();
11801180
return ret;
11811181
}
11821182

‎utilcode/lib/src/main/java/com/blankj/utilcode/util/ToastUtils.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -399,16 +399,16 @@ static class SafeHandler extends Handler {
399399

400400
@Override
401401
public void handleMessage(Message msg) {
402-
try {
403-
impl.handleMessage(msg);
404-
} catch (Exception e) {
405-
Log.e("ToastUtils", e.toString());
406-
}
402+
impl.handleMessage(msg);
407403
}
408404

409405
@Override
410406
public void dispatchMessage(Message msg) {
411-
impl.dispatchMessage(msg);
407+
try {
408+
impl.dispatchMessage(msg);
409+
} catch (Exception e) {
410+
Log.e("ToastUtils", e.toString());
411+
}
412412
}
413413
}
414414
}

‎utilcode/lib/src/test/java/com/blankj/utilcode/util/TimeUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class TimeUtilsTest {
3636
private final Date tomorrowTimeDate = new Date(tomorrowTimeMillis);
3737
private final String tomorrowTimeString = defaultFormat.format(tomorrowTimeDate);
3838
private final String tomorrowTimeStringFormat = mFormat.format(tomorrowTimeDate);
39-
private final long delta = 8;// 允许误差8ms
39+
private final long delta = 10;// 允许误差 10ms
4040

4141
@Test
4242
public void millis2String() {

‎utilcode/pkg/src/main/res/layout/activity_adapt_close.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
android:layout_width="match_parent"
77
android:layout_height="match_parent"
88
android:background="@color/white"
9-
tools:context=".pkg.feature.core.adaptScreen.CloseAdaptActivity">
9+
tools:context=".feature.adaptScreen.CloseAdaptActivity">
1010

1111
<android.support.constraint.ConstraintLayout
1212
android:layout_width="match_parent"

‎utilcode/pkg/src/main/res/layout/activity_adapt_height.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
android:layout_width="match_parent"
77
android:layout_height="match_parent"
88
android:background="@color/white"
9-
tools:context=".pkg.feature.core.adaptScreen.HeightActivity">
9+
tools:context=".feature.adaptScreen.HeightActivity">
1010

1111
<android.support.constraint.ConstraintLayout
1212
android:layout_width="wrap_content"

‎utilcode/pkg/src/main/res/layout/activity_adapt_width.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
android:layout_width="match_parent"
77
android:layout_height="match_parent"
88
android:background="@color/white"
9-
tools:context=".pkg.feature.core.adaptScreen.WidthActivity">
9+
tools:context=".feature.adaptScreen.WidthActivity">
1010

1111
<android.support.constraint.ConstraintLayout
1212
android:layout_width="match_parent"

0 commit comments

Comments
 (0)