Skip to content

Commit bfc0a67

Browse files
BlankjBlankj
committed
see 08/25 log
1 parent c80cdc9 commit bfc0a67

32 files changed

+228
-99
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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.java

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

‎gradle.properties

Lines changed: 2 additions & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 13 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.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 : 批量压缩文件
@@ -1262,5 +1271,7 @@ getComments : 获取压缩文件中的注释链表
12621271
[vibrate.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/VibrateUtils.java
12631272
[vibrate.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/vibrate/VibrateActivity.kt
12641273

1274+
[view.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ViewUtils.java
1275+
12651276
[zip.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ZipUtils.java
12661277
[zip.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/test/java/com/blankj/utilcode/util/ZipUtilsTest.java

‎lib/utilcode/README.md

Lines changed: 14 additions & 3 deletions
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
@@ -1187,7 +1196,7 @@ getComments
11871196
[log.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/log/LogActivity.kt
11881197

11891198
[map.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/MapUtils.java
1190-
[map.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/test/java/com/blankj/utilcode/util/MapUtilsTest.java
1199+
[map.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/test/java/com/blankj/utilcode/util/MapUtilsTest.java
11911200

11921201
[metaData.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/MetaDataUtils.java
11931202
[metaData.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/metaData/MetaDataActivity.kt
@@ -1262,5 +1271,7 @@ getComments
12621271
[vibrate.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/VibrateUtils.java
12631272
[vibrate.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/vibrate/VibrateActivity.kt
12641273

1274+
[view.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ViewUtils.java
1275+
12651276
[zip.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ZipUtils.java
12661277
[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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 5 additions & 5 deletions
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

Lines changed: 1 addition & 1 deletion
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;

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

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.util.UUID;
2323

2424
import static android.Manifest.permission.ACCESS_WIFI_STATE;
25+
import static android.Manifest.permission.CHANGE_WIFI_STATE;
2526
import static android.Manifest.permission.INTERNET;
2627
import static android.content.Context.WIFI_SERVICE;
2728

@@ -106,11 +107,12 @@ public static String getAndroidID() {
106107
/**
107108
* Return the MAC address.
108109
* <p>Must hold {@code <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />},
109-
* {@code <uses-permission android:name="android.permission.INTERNET" />}</p>
110+
* {@code <uses-permission android:name="android.permission.INTERNET" />},
111+
* {@code <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />}</p>
110112
*
111113
* @return the MAC address
112114
*/
113-
@RequiresPermission(allOf = {ACCESS_WIFI_STATE, INTERNET})
115+
@RequiresPermission(allOf = {ACCESS_WIFI_STATE, INTERNET, CHANGE_WIFI_STATE})
114116
public static String getMacAddress() {
115117
String macAddress = getMacAddress((String[]) null);
116118
if (!macAddress.equals("") || getWifiEnabled()) return macAddress;
@@ -126,10 +128,18 @@ private static boolean getWifiEnabled() {
126128
return manager.isWifiEnabled();
127129
}
128130

131+
/**
132+
* Enable or disable wifi.
133+
* <p>Must hold {@code <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />}</p>
134+
*
135+
* @param enabled True to enabled, false otherwise.
136+
*/
137+
@RequiresPermission(CHANGE_WIFI_STATE)
129138
private static void setWifiEnabled(final boolean enabled) {
130139
@SuppressLint("WifiManagerLeak")
131140
WifiManager manager = (WifiManager) Utils.getApp().getSystemService(WIFI_SERVICE);
132141
if (manager == null) return;
142+
if (enabled == manager.isWifiEnabled()) return;
133143
manager.setWifiEnabled(enabled);
134144
}
135145

@@ -372,9 +382,8 @@ public static boolean isEmulator() {
372382
/**
373383
* Return the unique device id.
374384
* <pre>{1}{UUID(macAddress)}</pre>
375-
* <pre>{2}{UUID(deviceId )}</pre>
376-
* <pre>{3}{UUID(androidId )}</pre>
377-
* <pre>{4}{UUID(random )}</pre>
385+
* <pre>{2}{UUID(androidId )}</pre>
386+
* <pre>{9}{UUID(random )}</pre>
378387
*
379388
* @return the unique device id
380389
*/
@@ -386,9 +395,8 @@ public static String getUniqueDeviceId() {
386395
/**
387396
* Return the unique device id.
388397
* <pre>{prefix}{1}{UUID(macAddress)}</pre>
389-
* <pre>{prefix}{2}{UUID(deviceId )}</pre>
390-
* <pre>{prefix}{3}{UUID(androidId )}</pre>
391-
* <pre>{prefix}{4}{UUID(random )}</pre>
398+
* <pre>{prefix}{2}{UUID(androidId )}</pre>
399+
* <pre>{prefix}{9}{UUID(random )}</pre>
392400
*
393401
* @param prefix The prefix of the unique device id.
394402
* @return the unique device id
@@ -414,13 +422,8 @@ public static String getUniqueDeviceId(String prefix) {
414422
return saveUdid(prefix + 2, androidId);
415423
}
416424

417-
final String deviceId = ((TelephonyManager) Utils.getApp().getSystemService(Context.TELEPHONY_SERVICE)).getDeviceId();
418-
if (!TextUtils.isEmpty(deviceId)) {
419-
return saveUdid(prefix + 3, deviceId);
420-
}
421-
422425
} catch (Exception ignore) {/**/}
423-
return saveUdid(prefix + 4, "");
426+
return saveUdid(prefix + 9, "");
424427
}
425428
}
426429
}
@@ -448,12 +451,6 @@ public static boolean isSameDevice(final String uniqueDeviceId) {
448451
return false;
449452
}
450453
return uniqueDeviceId.substring(st + 1).equals(getUdid("", androidId));
451-
} else if (type.startsWith("3")) {
452-
final String deviceId = ((TelephonyManager) Utils.getApp().getSystemService(Context.TELEPHONY_SERVICE)).getDeviceId();
453-
if (TextUtils.isEmpty(deviceId)) {
454-
return false;
455-
}
456-
return uniqueDeviceId.substring(st + 1).equals(getUdid("", deviceId));
457454
}
458455
return false;
459456
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1152,7 +1152,7 @@ private static byte[] joins(final byte[] prefix, final byte[] suffix) {
11521152
return ret;
11531153
}
11541154

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

11581158
private static String bytes2HexString(final byte[] bytes) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1221,7 +1221,7 @@ public interface OnReplaceListener {
12211221
// other utils methods
12221222
///////////////////////////////////////////////////////////////////////////
12231223

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

12271227
private static String bytes2HexString(final byte[] bytes) {

0 commit comments

Comments
 (0)