Skip to content

Commit 7bc1ec6

Browse files
BlankjBlankj
committed
Merge branch '1.25.9'
2 parents 4a3c080 + bfc0a67 commit 7bc1ec6

33 files changed

+259
-143
lines changed

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
* `19/08/25` [upd] ImageUtils#getImageType. [add] LogUtils# Publish v1.25.9.
2+
* `19/08/24` [fix] PhoneUtils#getIMEI crash on SDK 29.
3+
* `19/08/23` [add] ViewUtils#isLayoutRtl.
4+
* `19/08/22` [add] LogUtils#getLogFiles.
15
* `19/08/13` [add] MapUtils and MapUtilsTest. Publish v1.25.8.
26
* `19/08/12` [add] CollectionUtils and CollectionUtilsTest.
37
* `19/08/11` [add] ArrayUtils and ArrayUtilsTest.

‎README-CN.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
[frame]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/auc_frame_cn.png
5353

54-
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.8-brightgreen.svg
54+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.9-brightgreen.svg
5555
[auc]: https://github.com/Blankj/AndroidUtilCode
5656

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

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ If this project helps you a lot and you want to support the project's developmen
5151

5252
[frame]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/auc_frame.png
5353

54-
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.8-brightgreen.svg
54+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.9-brightgreen.svg
5555
[auc]: https://github.com/Blankj/AndroidUtilCode
5656

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ class Config {
1414
static compileSdkVersion = 28
1515
static minSdkVersion = 14
1616
static targetSdkVersion = 28
17-
static versionCode = 1_025_008
18-
static versionName = '1.25.8-alpha1'// E.g. 1.9.72 => 1,009,072
17+
static versionCode = 1_025_009
18+
static versionName = '1.25.9'// E.g. 1.9.72 => 1,009,072
1919

2020
// lib version
2121
static kotlin_version = '1.3.10'

‎buildSrc/src/main/groovy/GitUtils.groovy

+32-45
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import org.gradle.api.Action
22
import org.gradle.api.Project
3-
import org.gradle.api.Task
43
import org.gradle.api.invocation.Gradle
54

65
import java.text.SimpleDateFormat
@@ -34,55 +33,43 @@ class GitUtils {
3433
}
3534

3635
static void addGitPushTask(Project project) {
37-
project.task("gitPush", new Action<Task>() {
38-
@Override
39-
void execute(Task task) {
40-
task.doLast {
41-
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM/dd")
42-
String date = simpleDateFormat.format(new Date())
43-
GLog.d(ShellUtils.execCmd([
44-
"git add -A",
45-
"git commit -m \"see $date log\"",
46-
"git push origin $sCurBranchName"
47-
] as String[]))
48-
}
49-
}
50-
})
36+
project.task("gitPush").doLast {
37+
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM/dd")
38+
String date = simpleDateFormat.format(new Date())
39+
GLog.d(ShellUtils.execCmd([
40+
"git add -A",
41+
"git commit -m \"see $date log\"",
42+
"git push origin $sCurBranchName"
43+
] as String[]))
44+
}
5145
}
5246

5347
static void addGitPushAndMerge2MasterTask(Project project) {
54-
project.task("gitPushAndMerge2Master", new Action<Task>() {
55-
@Override
56-
void execute(Task task) {
57-
task.doLast {
58-
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM/dd")
59-
String date = simpleDateFormat.format(new Date())
60-
GLog.d(ShellUtils.execCmd([
61-
"git add -A",
62-
"git commit -m \"see $date log\"",
63-
"git push origin $sCurBranchName",
64-
"git checkout master",
65-
"git merge $sCurBranchName",
66-
"git push origin master",
67-
"git checkout $sCurBranchName",
68-
] as String[]))
69-
}
70-
}
71-
})
48+
project.task("gitPushAndMerge2Master").doLast {
49+
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM/dd")
50+
String date = simpleDateFormat.format(new Date())
51+
GLog.d(ShellUtils.execCmd([
52+
"git add -A",
53+
"git commit -m \"see $date log\"",
54+
"git push origin $sCurBranchName",
55+
"git checkout master",
56+
"git merge $sCurBranchName",
57+
"git push origin master",
58+
"git checkout $sCurBranchName",
59+
] as String[]))
60+
}
7261
}
7362

7463
static void addGitNewBranchTask(Project project) {
75-
project.task("gitNewBranch", new Action<Task>() {
76-
@Override
77-
void execute(Task task) {
78-
task.doLast {
79-
GLog.d(ShellUtils.execCmd([
80-
"git checkout master",
81-
"git checkout -b ${Config.versionName}",
82-
"git push origin ${Config.versionName}:${Config.versionName}",
83-
] as String[]))
84-
}
85-
}
86-
})
64+
project.task("gitNewBranch").doLast {
65+
GLog.d(ShellUtils.execCmd([
66+
"git checkout master",
67+
"git checkout -b ${Config.versionName}",
68+
"git push origin ${Config.versionName}:${Config.versionName}",
69+
] as String[]))
70+
}
8771
}
8872
}
73+
// ./gradlew gitPush
74+
// ./gradlew gitPushAndMerge2Master
75+
// ./gradlew gitNewBranch

‎buildSrc/src/main/groovy/GitUtils.java

-12
This file was deleted.

‎gradle.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
org.gradle.jvmargs=-Xmx8192m -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -XX:-UseGCOverheadLimit -Dfile.encoding=UTF-8
1717
org.gradle.daemon=true
1818
#org.gradle.configureondemand=true
19-
#org.gradle.parallel=true
19+
org.gradle.parallel=true
20+
org.gradle.caching=true
2021

2122
#-Dorg.gradle.debug=true --no-daemon

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

‎lib/utilcode/README-CN.md

+13-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

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

1111

@@ -1069,6 +1069,15 @@ vibrate: 震动
10691069
cancel : 取消
10701070
```
10711071

1072+
* ### 视图相关 -> [ViewUtils.java][view.java]
1073+
```
1074+
setViewEnabled : 设置视图是否可用
1075+
runOnUiThread : 在 UI 线程运行
1076+
runOnUiThreadDelayed: 在 UI 线程延迟运行
1077+
isLayoutRtl : 布局是否从右到左
1078+
fixScrollViewTopping: 修复 ScrollView 置顶问题
1079+
```
1080+
10721081
* ### 压缩相关 -> [ZipUtils.java][zip.java] -> [Test][zip.test]
10731082
```
10741083
zipFiles : 批量压缩文件
@@ -1269,5 +1278,7 @@ getComments : 获取压缩文件中的注释链表
12691278
[vibrate.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/VibrateUtils.java
12701279
[vibrate.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/vibrate/VibrateActivity.kt
12711280

1281+
[view.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ViewUtils.java
1282+
12721283
[zip.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ZipUtils.java
12731284
[zip.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/test/java/com/blankj/utilcode/util/ZipUtilsTest.java

‎lib/utilcode/README.md

+13-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

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

1111

@@ -1069,6 +1069,15 @@ vibrate
10691069
cancel
10701070
```
10711071

1072+
* ### About View -> [ViewUtils.java][view.java]
1073+
```
1074+
setViewEnabled
1075+
runOnUiThread
1076+
runOnUiThreadDelayed
1077+
isLayoutRtl
1078+
fixScrollViewTopping
1079+
```
1080+
10721081
* ### About Zip -> [ZipUtils.java][zip.java] -> [Test][zip.test]
10731082
```
10741083
zipFiles
@@ -1266,5 +1275,7 @@ getComments
12661275
[vibrate.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/VibrateUtils.java
12671276
[vibrate.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/vibrate/VibrateActivity.kt
12681277

1278+
[view.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ViewUtils.java
1279+
12691280
[zip.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ZipUtils.java
12701281
[zip.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/test/java/com/blankj/utilcode/util/ZipUtilsTest.java

‎lib/utilcode/src/main/java/com/blankj/utilcode/constant/PermissionConstants.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public final class PermissionConstants {
6464
permission.RECEIVE_WAP_PUSH, permission.RECEIVE_MMS,
6565
};
6666
private static final String[] GROUP_STORAGE = {
67-
permission.READ_EXTERNAL_STORAGE, permission.WRITE_EXTERNAL_STORAGE
67+
permission.READ_EXTERNAL_STORAGE, permission.WRITE_EXTERNAL_STORAGE,
6868
};
6969

7070
@StringDef({CALENDAR, CAMERA, CONTACTS, LOCATION, MICROPHONE, PHONE, SENSORS, SMS, STORAGE,})

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -865,7 +865,7 @@ private static boolean isSpace(final String s) {
865865
return true;
866866
}
867867

868-
private static final char HEX_DIGITS[] =
868+
private static final char[] HEX_DIGITS =
869869
{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
870870

871871
private static byte[] hashTemplate(final byte[] data, final String algorithm) {

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ private ConvertUtils() {
3535
throw new UnsupportedOperationException("u can't instantiate me...");
3636
}
3737

38-
private static final char hexDigits[] =
38+
private static final char[] hexDigits =
3939
{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
4040

4141
/**
@@ -581,7 +581,7 @@ public static Bitmap view2Bitmap(final View view) {
581581
* @return value of px
582582
*/
583583
public static int dp2px(final float dpValue) {
584-
final float scale = Resources.getSystem().getDisplayMetrics().density;
584+
final float scale = Utils.getApp().getResources().getDisplayMetrics().density;
585585
return (int) (dpValue * scale + 0.5f);
586586
}
587587

@@ -592,7 +592,7 @@ public static int dp2px(final float dpValue) {
592592
* @return value of dp
593593
*/
594594
public static int px2dp(final float pxValue) {
595-
final float scale = Resources.getSystem().getDisplayMetrics().density;
595+
final float scale = Utils.getApp().getResources().getDisplayMetrics().density;
596596
return (int) (pxValue / scale + 0.5f);
597597
}
598598

@@ -603,7 +603,7 @@ public static int px2dp(final float pxValue) {
603603
* @return value of px
604604
*/
605605
public static int sp2px(final float spValue) {
606-
final float fontScale = Resources.getSystem().getDisplayMetrics().scaledDensity;
606+
final float fontScale = Utils.getApp().getResources().getDisplayMetrics().scaledDensity;
607607
return (int) (spValue * fontScale + 0.5f);
608608
}
609609

@@ -614,7 +614,7 @@ public static int sp2px(final float spValue) {
614614
* @return value of sp
615615
*/
616616
public static int px2sp(final float pxValue) {
617-
final float fontScale = Resources.getSystem().getDisplayMetrics().scaledDensity;
617+
final float fontScale = Utils.getApp().getResources().getDisplayMetrics().scaledDensity;
618618
return (int) (pxValue / fontScale + 0.5f);
619619
}
620620

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public final class CrashUtils {
4141

4242
private static final String FILE_SEP = System.getProperty("file.separator");
4343
@SuppressLint("SimpleDateFormat")
44-
private static final Format FORMAT = new SimpleDateFormat("MM-dd HH-mm-ss");
44+
private static final Format FORMAT = new SimpleDateFormat("MM-dd_HH-mm-ss");
4545

4646
private static final UncaughtExceptionHandler DEFAULT_UNCAUGHT_EXCEPTION_HANDLER;
4747
private static final UncaughtExceptionHandler UNCAUGHT_EXCEPTION_HANDLER;

0 commit comments

Comments
 (0)