Skip to content

Commit 3376626

Browse files
BlankjBlankj
committed
see 04/25 log
1 parent ed567e1 commit 3376626

20 files changed

Lines changed: 322 additions & 98 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
* `20/04/25` [fix] UriUtils#uri2File Unknown URI. Publish 1.28.2.
2+
* `20/04/24` [add] SnackbarUtils support show on the top; UriUtils#uri2InputStream.
3+
* `20/04/23` [fix] UriUtils#uri2File not support HW; TransActivity crash below 21.
4+
* `20/04/23` [fix] PhoneUtils#getSerial, PhoneUtils#getSerial crash on Android 10.
5+
* `20/04/20` [fix] ImageUtils#isImage.
16
* `20/04/18` [fix] PermissionUtils#callback. Publish v1.28.1.
27
* `20/04/17` [fix] ImageUtils#view2Bitmap, ImageUtils.getBitmap(InputStream).
38
* `20/04/16` [add] ConvertUtils#int2HexString, hexString2Int.

‎buildSrc/src/main/groovy/Config.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ class Config {
1414
static compileSdkVersion = 29
1515
static minSdkVersion = 14
1616
static targetSdkVersion = 29
17-
static versionCode = 1_026_001
18-
static versionName = '1.28.1'// E.g. 1.9.72 => 1,009,072
17+
static versionCode = 1_028_002
18+
static versionName = '1.28.2'// E.g. 1.9.72 => 1,009,072
1919

2020
// lib version
2121
static gradlePluginVersion = '3.5.0'

‎feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bus/BusActivity.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.blankj.utilcode.pkg.feature.bus
22

33
import android.content.Context
44
import android.content.Intent
5+
import android.os.Bundle
56
import android.support.annotation.Keep
67
import com.blankj.common.activity.CommonActivity
78
import com.blankj.common.item.CommonItem

‎feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/image/ImageActivity.kt‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import com.blankj.common.activity.CommonActivity
1111
import com.blankj.common.item.CommonItem
1212
import com.blankj.common.item.CommonItemClick
1313
import com.blankj.common.item.CommonItemImage
14+
import com.blankj.common.item.CommonItemTitle
1415
import com.blankj.utilcode.pkg.Config
1516
import com.blankj.utilcode.pkg.R
1617
import com.blankj.utilcode.util.*
@@ -26,6 +27,9 @@ import java.util.*
2627
*/
2728
class ImageActivity : CommonActivity() {
2829

30+
private val savePath = Config.CACHE_PATH + "lena.jpg"
31+
private val titleItem: CommonItemTitle = CommonItemTitle("isImage: $savePath", "");
32+
2933
companion object {
3034
fun start(context: Context) {
3135
val starter = Intent(context, ImageActivity::class.java)
@@ -57,23 +61,27 @@ class ImageActivity : CommonActivity() {
5761
val width = src.width
5862
val height = src.height
5963

64+
titleItem.setContent(ImageUtils.isImage(savePath).toString())
65+
6066
return CollectionUtils.newArrayList<CommonItem<*>>().apply {
61-
add(CommonItemClick(R.string.image_save) {
62-
val savePath = Config.CACHE_PATH + "lena.jpg"
67+
add(titleItem)
68+
add(CommonItemClick("Save to $savePath") {
6369
ThreadUtils.executeBySingle(object : ThreadUtils.SimpleTask<Boolean>() {
6470
override fun doInBackground(): Boolean {
6571
return ImageUtils.save(src, savePath, Bitmap.CompressFormat.JPEG)
6672
}
6773

6874
override fun onSuccess(result: Boolean) {
75+
titleItem.setContent(ImageUtils.isImage(savePath).toString())
76+
titleItem.update()
6977
SnackbarUtils.with(mContentView)
7078
.setDuration(SnackbarUtils.LENGTH_LONG)
7179
.apply {
7280
if (result) {
73-
setMessage("save to \"$savePath\" successful.")
81+
setMessage("save successful.")
7482
.showSuccess()
7583
} else {
76-
setMessage("save to \"$savePath\" failed.")
84+
setMessage("save failed.")
7785
.showError()
7886
}
7987
}

‎feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/snackbar/SnackbarActivity.kt‎

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,49 +39,64 @@ class SnackbarActivity : CommonActivity() {
3939

4040
override fun bindItems(): MutableList<CommonItem<*>> {
4141
return CollectionUtils.newArrayList(
42-
CommonItemClick(R.string.snackbar_show_short) {
42+
CommonItemClick(R.string.snackbar_short) {
4343
SnackbarUtils.with(mContentView)
4444
.setMessage(getMsg(R.string.snackbar_short))
4545
.setMessageColor(Color.WHITE)
4646
.setBgResource(R.drawable.snackbar_custom_bg)
4747
.show()
4848
},
49-
CommonItemClick(R.string.snackbar_show_short_with_action) {
49+
CommonItemClick(R.string.snackbar_short_top) {
5050
SnackbarUtils.with(mContentView)
51-
.setMessage(getMsg(R.string.snackbar_short))
51+
.setMessage(getMsg(R.string.snackbar_short_top))
52+
.setMessageColor(Color.WHITE)
53+
.setBgResource(R.drawable.snackbar_custom_bg)
54+
.show(true)
55+
},
56+
CommonItemClick(R.string.snackbar_short_with_action) {
57+
SnackbarUtils.with(mContentView)
58+
.setMessage(getMsg(R.string.snackbar_short_with_action))
5259
.setMessageColor(Color.WHITE)
5360
.setBgResource(R.drawable.snackbar_custom_bg)
5461
.setAction(getString(R.string.snackbar_click), Color.YELLOW) { ToastUtils.showShort(getString(R.string.snackbar_click)) }
5562
.show()
5663
},
57-
CommonItemClick(R.string.snackbar_show_long) {
64+
CommonItemClick(R.string.snackbar_short_with_action_top) {
65+
SnackbarUtils.with(mContentView)
66+
.setMessage(getMsg(R.string.snackbar_short_with_action_top))
67+
.setMessageColor(Color.WHITE)
68+
.setBgResource(R.drawable.snackbar_custom_bg)
69+
.setAction(getString(R.string.snackbar_click), Color.YELLOW) { ToastUtils.showShort(getString(R.string.snackbar_click)) }
70+
.show(true)
71+
},
72+
CommonItemClick(R.string.snackbar_long) {
5873
SnackbarUtils.with(mContentView)
5974
.setMessage(getMsg(R.string.snackbar_long))
6075
.setMessageColor(Color.WHITE)
6176
.setDuration(SnackbarUtils.LENGTH_LONG)
6277
.setBgResource(R.drawable.snackbar_custom_bg)
6378
.show()
6479
},
65-
CommonItemClick(R.string.snackbar_show_long_with_action) {
80+
CommonItemClick(R.string.snackbar_long_with_action) {
6681
SnackbarUtils.with(mContentView)
67-
.setMessage(getMsg(R.string.snackbar_long))
82+
.setMessage(getMsg(R.string.snackbar_long_with_action))
6883
.setMessageColor(Color.WHITE)
6984
.setBgResource(R.drawable.snackbar_custom_bg)
7085
.setDuration(SnackbarUtils.LENGTH_LONG)
7186
.setAction(getString(R.string.snackbar_click), Color.YELLOW) { ToastUtils.showShort(getString(R.string.snackbar_click)) }
7287
.show()
7388
},
74-
CommonItemClick(R.string.snackbar_show_indefinite) {
89+
CommonItemClick(R.string.snackbar_indefinite) {
7590
SnackbarUtils.with(mContentView)
7691
.setMessage(getMsg(R.string.snackbar_indefinite))
7792
.setMessageColor(Color.WHITE)
7893
.setDuration(SnackbarUtils.LENGTH_INDEFINITE)
7994
.setBgResource(R.drawable.snackbar_custom_bg)
8095
.show()
8196
},
82-
CommonItemClick(R.string.snackbar_show_indefinite_with_action) {
97+
CommonItemClick(R.string.snackbar_indefinite_with_action) {
8398
SnackbarUtils.with(mContentView)
84-
.setMessage(getMsg(R.string.snackbar_indefinite))
99+
.setMessage(getMsg(R.string.snackbar_indefinite_with_action))
85100
.setMessageColor(Color.WHITE)
86101
.setDuration(SnackbarUtils.LENGTH_INDEFINITE)
87102
.setBgResource(R.drawable.snackbar_custom_bg)
@@ -113,17 +128,17 @@ class SnackbarActivity : CommonActivity() {
113128
snackbarView.setOnClickListener { SnackbarUtils.dismiss() }
114129
}
115130
},
116-
CommonItemClick(R.string.snackbar_show_success) {
131+
CommonItemClick(R.string.snackbar_success) {
117132
SnackbarUtils.with(mContentView)
118133
.setMessage(getMsg(R.string.snackbar_success))
119134
.showSuccess()
120135
},
121-
CommonItemClick(R.string.snackbar_show_warning) {
136+
CommonItemClick(R.string.snackbar_warning) {
122137
SnackbarUtils.with(mContentView)
123138
.setMessage(getMsg(R.string.snackbar_warning))
124139
.showWarning()
125140
},
126-
CommonItemClick(R.string.snackbar_show_error) {
141+
CommonItemClick(R.string.snackbar_error) {
127142
SnackbarUtils.with(mContentView)
128143
.setMessage(getMsg(R.string.snackbar_error))
129144
.showError()

‎feature/utilcode/pkg/src/main/res/values/strings.xml‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@
207207
<string name="image_fast_blur">Fast Blur</string>
208208
<string name="image_render_script_blur">Render Script Blur</string>
209209
<string name="image_stack_blur">Stack Blur</string>
210-
<string name="image_save">Save</string>
211210
<string name="image_compress_by_scale">Compress By Scale</string>
212211
<string name="image_compress_by_quality_half">Compress By Quality Half</string>
213212
<string name="image_compress_by_quality_max_size">Compress By Quality Max Size</string>
@@ -295,26 +294,22 @@
295294
<string name="screen_screenshot">Screenshot</string>
296295

297296
<!--SnackBar 相关-->
298-
<string name="snackbar_show_short">Show Short Snackbar</string>
299-
<string name="snackbar_show_short_with_action">Show Short Snackbar With Action</string>
300-
<string name="snackbar_show_long">Show Long Snackbar</string>
301-
<string name="snackbar_show_long_with_action">Show Long Snackbar With Action</string>
302-
<string name="snackbar_show_indefinite">Show Indefinite Snackbar</string>
303-
<string name="snackbar_show_indefinite_with_action">Show Indefinite Snackbar With Action</string>
304-
<string name="snackbar_add_view">Add View</string>
305-
<string name="snackbar_add_view_with_action">Add View With Action</string>
306-
<string name="snackbar_show_success">Show Success</string>
307-
<string name="snackbar_show_warning">Show Warning</string>
308-
<string name="snackbar_show_error">Show Error</string>
309-
<string name="snackbar_dismiss">Dismiss Snackbar</string>
310297
<string name="snackbar_short">Short Snackbar</string>
298+
<string name="snackbar_short_top">Short Snackbar Top</string>
299+
<string name="snackbar_short_with_action">Short Snackbar With Action</string>
300+
<string name="snackbar_short_with_action_top">Short Snackbar With Action Top</string>
311301
<string name="snackbar_long">Long Snackbar</string>
302+
<string name="snackbar_long_with_action">Long Snackbar With Action</string>
312303
<string name="snackbar_indefinite">Indefinite Snackbar</string>
313-
<string name="snackbar_click">Click</string>
314-
<string name="snackbar_custom_view">Custom View</string>
304+
<string name="snackbar_indefinite_with_action">Indefinite Snackbar With Action</string>
305+
<string name="snackbar_add_view">Add View</string>
306+
<string name="snackbar_add_view_with_action">Add View With Action</string>
315307
<string name="snackbar_success">Success</string>
316308
<string name="snackbar_warning">Warning</string>
317309
<string name="snackbar_error">Error</string>
310+
<string name="snackbar_dismiss">Dismiss Snackbar</string>
311+
<string name="snackbar_click">Click</string>
312+
<string name="snackbar_custom_view">Custom View</string>
318313
<string name="snackbar_click_to_dismiss">Click To Dismiss</string>
319314

320315
<!--SP 相关-->

‎lib/common/src/main/java/com/blankj/common/item/CommonItemTitle.java‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,25 @@ public void bind(@NonNull ItemViewHolder holder, int position) {
7474
}
7575

7676
public void setTitle(CharSequence title) {
77+
setTitle(title, true);
78+
}
79+
80+
public void setContent(CharSequence content) {
81+
setContent(content, true);
82+
}
83+
84+
public void setTitle(CharSequence title, boolean isUpdate) {
7785
mTitle = title;
78-
update();
86+
if (isUpdate) {
87+
update();
88+
}
89+
}
90+
91+
public void setContent(CharSequence content, boolean isUpdate) {
92+
mContent = content;
93+
if (isUpdate) {
94+
update();
95+
}
7996
}
8097

8198
public CharSequence getTitle() {

‎lib/utilcode/README-CN.md‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
Gradle:
44
```groovy
5-
implementation 'com.blankj:utilcode:1.28.1'
5+
implementation 'com.blankj:utilcode:1.28.2'
66
77
// if u use AndroidX, use the following
8-
implementation 'com.blankj:utilcodex:1.28.1'
8+
implementation 'com.blankj:utilcodex:1.28.2'
99
```
1010

1111

@@ -1157,9 +1157,10 @@ removeListener: 移除消息监听器
11571157

11581158
* ### URI 相关 -> [UriUtils.java][uri.java]
11591159
```
1160-
res2Uri : res 转 uri
1161-
file2Uri: file 转 uri
1162-
uri2File: uri 转 file
1160+
res2Uri : res 转 uri
1161+
file2Uri : file 转 uri
1162+
uri2File : uri 转 file
1163+
uri2InputStream: uri 转 InputStream
11631164
```
11641165

11651166
* ### UtilsTransActivity -> [UtilsTransActivity.java][trans.java]

‎lib/utilcode/README.md‎

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

33
Gradle:
44
```groovy
5-
implementation 'com.blankj:utilcode:1.28.1'
5+
implementation 'com.blankj:utilcode:1.28.2'
66
77
// if u use AndroidX, use the following
8-
implementation 'com.blankj:utilcodex:1.28.1'
8+
implementation 'com.blankj:utilcodex:1.28.2'
99
```
1010

1111

@@ -1160,6 +1160,7 @@ removeListener
11601160
res2Uri
11611161
file2Uri
11621162
uri2File
1163+
uri2InputStream
11631164
```
11641165

11651166
* ### UtilsTransActivity -> [UtilsTransActivity.java][trans.java]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public final class BusUtils {
3434
private final Map<String, List<BusInfo>> mTag_BusInfoListMap = new HashMap<>();
3535

3636
private final Map<String, Set<Object>> mClassName_BusesMap = new ConcurrentHashMap<>();
37-
private final Map<String, List<String>> mClassName_TagsMap = new HashMap<>();
37+
private final Map<String, List<String>> mClassName_TagsMap = new ConcurrentHashMap<>();
3838
private final Map<String, Map<String, Object>> mClassName_Tag_Arg4StickyMap = new ConcurrentHashMap<>();
3939

4040
private BusUtils() {
@@ -122,7 +122,7 @@ private void registerInner(final Object bus) {
122122
synchronized (mClassName_TagsMap) {
123123
tags = mClassName_TagsMap.get(className);
124124
if (tags == null) {
125-
tags = new ArrayList<>();
125+
tags = new CopyOnWriteArrayList<>();
126126
for (Map.Entry<String, List<BusInfo>> entry : mTag_BusInfoListMap.entrySet()) {
127127
for (BusInfo busInfo : entry.getValue()) {
128128
try {

0 commit comments

Comments
 (0)