Skip to content

Commit f835ce5

Browse files
BlankjBlankj
committed
see 05/28 log
1 parent a1dda9a commit f835ce5

File tree

15 files changed

+82
-81
lines changed

15 files changed

+82
-81
lines changed

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

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

‎app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ dependencies {
5656
// LeakCanary
5757
debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanary_version"
5858
releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary_version"
59-
// implementation 'com.blankj:utilcode:1.16.1'
59+
// implementation 'com.blankj:utilcode:1.16.2'
6060
}
6161

6262

‎build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ ext {
4444
min_sdk_version = 14
4545
target_sdk_version = 27
4646

47-
version_code = 1_016_001
48-
version_name = '1.16.1'// E.g 1.9.72 => 1,009,072
47+
version_code = 1_016_002
48+
version_name = '1.16.2'// E.g 1.9.72 => 1,009,072
4949

5050
// App dependencies
5151
support_version = '27.1.0'

‎update_log.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* 18/05/29 完善 TimeUtils 的 timeSpan 带符号位，ToastUtils 去除弱引用，发布 1.16.2 版本
12
* 18/05/25 新增 AppUtils#registerAppStatusChangedListener 和 AppUtils#unregisterAppStatusChangedListener，发布 1.16.1 版本
23
* 18/05/22 新增 ThreadUtils，发布 1.16.0 版本
34
* 18/05/15 新增 MetaDataUtils 和 ActivityUtils#startActivityForResult，发布 1.15.1 版本

‎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.16.1'
5+
implementation 'com.blankj:utilcode:1.16.2'
66
```
77

88

‎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.16.1'
5+
implementation 'com.blankj:utilcode:1.16.2'
66
```
77

88

‎utilcode/src/main/java/com/blankj/utilcode/util/FileIOUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
*/
3232
public final class FileIOUtils {
3333

34+
private static int sBufferSize = 8192;
35+
3436
private FileIOUtils() {
3537
throw new UnsupportedOperationException("u can't instantiate me...");
3638
}
3739

38-
private static int sBufferSize = 8192;
39-
4040
/**
4141
* Write file from input stream.
4242
*

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
*/
2828
public final class FileUtils {
2929

30+
private static final String LINE_SEP = System.getProperty("line.separator");
31+
3032
private FileUtils() {
3133
throw new UnsupportedOperationException("u can't instantiate me...");
3234
}
3335

34-
private static final String LINE_SEP = System.getProperty("line.separator");
35-
3636
/**
3737
* Return the file by path.
3838
*

‎utilcode/src/main/java/com/blankj/utilcode/util/LogUtils.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,10 @@ public final class LogUtils {
7272
private static final String MIDDLE_CORNER = "├";
7373
private static final String LEFT_BORDER = "│ ";
7474
private static final String BOTTOM_CORNER = "└";
75-
private static final String SIDE_DIVIDER = "────────────────────────────────────────────────────────";
76-
private static final String MIDDLE_DIVIDER = "┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄";
75+
private static final String SIDE_DIVIDER =
76+
"────────────────────────────────────────────────────────";
77+
private static final String MIDDLE_DIVIDER =
78+
"┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄";
7779
private static final String TOP_BORDER = TOP_CORNER + SIDE_DIVIDER + SIDE_DIVIDER;
7880
private static final String MIDDLE_BORDER = MIDDLE_CORNER + MIDDLE_DIVIDER + MIDDLE_DIVIDER;
7981
private static final String BOTTOM_BORDER = BOTTOM_CORNER + SIDE_DIVIDER + SIDE_DIVIDER;

‎utilcode/src/main/java/com/blankj/utilcode/util/SPUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
@SuppressLint("ApplySharedPref")
2222
public final class SPUtils {
2323

24-
private static SimpleArrayMap<String, SPUtils> SP_UTILS_MAP = new SimpleArrayMap<>();
24+
private static final SimpleArrayMap<String, SPUtils> SP_UTILS_MAP = new SimpleArrayMap<>();
2525
private SharedPreferences sp;
2626

2727
/**

‎utilcode/src/main/java/com/blankj/utilcode/util/ThreadUtils.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
*/
2929
public final class ThreadUtils {
3030

31-
private static final Map<Integer, Map<Integer, ExecutorService>> TYPE_PRIORITY_POOLS
32-
= new ConcurrentHashMap<>();
33-
private static final Map<Task, ScheduledExecutorService> TASK_SCHEDULED
34-
= new ConcurrentHashMap<>();
31+
private static final Map<Integer, Map<Integer, ExecutorService>> TYPE_PRIORITY_POOLS =
32+
new ConcurrentHashMap<>();
33+
private static final Map<Task, ScheduledExecutorService> TASK_SCHEDULED =
34+
new ConcurrentHashMap<>();
3535

3636
private static final byte TYPE_SINGLE = -1;
3737
private static final byte TYPE_CACHED = -2;

‎utilcode/src/main/java/com/blankj/utilcode/util/TimeUtils.java

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,7 @@ public static long getTimeSpan(final String time1,
189189
final String time2,
190190
@NonNull final DateFormat format,
191191
@TimeConstants.Unit final int unit) {
192-
return millis2TimeSpan(
193-
Math.abs(string2Millis(time1, format) - string2Millis(time2, format)), unit
194-
);
192+
return millis2TimeSpan(string2Millis(time1, format) - string2Millis(time2, format), unit);
195193
}
196194

197195
/**
@@ -212,7 +210,7 @@ public static long getTimeSpan(final String time1,
212210
public static long getTimeSpan(final Date date1,
213211
final Date date2,
214212
@TimeConstants.Unit final int unit) {
215-
return millis2TimeSpan(Math.abs(date2Millis(date1) - date2Millis(date2)), unit);
213+
return millis2TimeSpan(date2Millis(date1) - date2Millis(date2), unit);
216214
}
217215

218216
/**
@@ -233,7 +231,7 @@ public static long getTimeSpan(final Date date1,
233231
public static long getTimeSpan(final long millis1,
234232
final long millis2,
235233
@TimeConstants.Unit final int unit) {
236-
return millis2TimeSpan(Math.abs(millis1 - millis2), unit);
234+
return millis2TimeSpan(millis1 - millis2, unit);
237235
}
238236

239237
/**
@@ -257,7 +255,7 @@ public static String getFitTimeSpan(final String time1,
257255
final String time2,
258256
final int precision) {
259257
long delta = string2Millis(time1, DEFAULT_FORMAT) - string2Millis(time2, DEFAULT_FORMAT);
260-
return millis2FitTimeSpan(Math.abs(delta), precision);
258+
return millis2FitTimeSpan(delta, precision);
261259
}
262260

263261
/**
@@ -282,7 +280,7 @@ public static String getFitTimeSpan(final String time1,
282280
@NonNull final DateFormat format,
283281
final int precision) {
284282
long delta = string2Millis(time1, format) - string2Millis(time2, format);
285-
return millis2FitTimeSpan(Math.abs(delta), precision);
283+
return millis2FitTimeSpan(delta, precision);
286284
}
287285

288286
/**
@@ -302,7 +300,7 @@ public static String getFitTimeSpan(final String time1,
302300
* @return the fit time span
303301
*/
304302
public static String getFitTimeSpan(final Date date1, final Date date2, final int precision) {
305-
return millis2FitTimeSpan(Math.abs(date2Millis(date1) - date2Millis(date2)), precision);
303+
return millis2FitTimeSpan(date2Millis(date1) - date2Millis(date2), precision);
306304
}
307305

308306
/**
@@ -324,7 +322,7 @@ public static String getFitTimeSpan(final Date date1, final Date date2, final in
324322
public static String getFitTimeSpan(final long millis1,
325323
final long millis2,
326324
final int precision) {
327-
return millis2FitTimeSpan(Math.abs(millis1 - millis2), precision);
325+
return millis2FitTimeSpan(millis1 - millis2, precision);
328326
}
329327

330328
/**
@@ -381,7 +379,7 @@ public static Date getNowDate() {
381379
* @return the time span by now, in unit
382380
*/
383381
public static long getTimeSpanByNow(final String time, @TimeConstants.Unit final int unit) {
384-
return getTimeSpan(getNowString(), time, DEFAULT_FORMAT, unit);
382+
return getTimeSpan(time, getNowString(), DEFAULT_FORMAT, unit);
385383
}
386384

387385
/**
@@ -402,7 +400,7 @@ public static long getTimeSpanByNow(final String time, @TimeConstants.Unit final
402400
public static long getTimeSpanByNow(final String time,
403401
@NonNull final DateFormat format,
404402
@TimeConstants.Unit final int unit) {
405-
return getTimeSpan(getNowString(format), time, format, unit);
403+
return getTimeSpan(time, getNowString(format), format, unit);
406404
}
407405

408406
/**
@@ -420,7 +418,7 @@ public static long getTimeSpanByNow(final String time,
420418
* @return the time span by now, in unit
421419
*/
422420
public static long getTimeSpanByNow(final Date date, @TimeConstants.Unit final int unit) {
423-
return getTimeSpan(new Date(), date, unit);
421+
return getTimeSpan(date, new Date(), unit);
424422
}
425423

426424
/**
@@ -438,7 +436,7 @@ public static long getTimeSpanByNow(final Date date, @TimeConstants.Unit final i
438436
* @return the time span by now, in unit
439437
*/
440438
public static long getTimeSpanByNow(final long millis, @TimeConstants.Unit final int unit) {
441-
return getTimeSpan(System.currentTimeMillis(), millis, unit);
439+
return getTimeSpan(millis, System.currentTimeMillis(), unit);
442440
}
443441

444442
/**
@@ -458,7 +456,7 @@ public static long getTimeSpanByNow(final long millis, @TimeConstants.Unit final
458456
* @return the fit time span by now
459457
*/
460458
public static String getFitTimeSpanByNow(final String time, final int precision) {
461-
return getFitTimeSpan(getNowString(), time, DEFAULT_FORMAT, precision);
459+
return getFitTimeSpan(time, getNowString(), DEFAULT_FORMAT, precision);
462460
}
463461

464462
/**
@@ -480,7 +478,7 @@ public static String getFitTimeSpanByNow(final String time, final int precision)
480478
public static String getFitTimeSpanByNow(final String time,
481479
@NonNull final DateFormat format,
482480
final int precision) {
483-
return getFitTimeSpan(getNowString(format), time, format, precision);
481+
return getFitTimeSpan(time, getNowString(format) , format, precision);
484482
}
485483

486484
/**
@@ -499,7 +497,7 @@ public static String getFitTimeSpanByNow(final String time,
499497
* @return the fit time span by now
500498
*/
501499
public static String getFitTimeSpanByNow(final Date date, final int precision) {
502-
return getFitTimeSpan(getNowDate(), date, precision);
500+
return getFitTimeSpan(date, getNowDate(), precision);
503501
}
504502

505503
/**
@@ -518,7 +516,7 @@ public static String getFitTimeSpanByNow(final Date date, final int precision) {
518516
* @return the fit time span by now
519517
*/
520518
public static String getFitTimeSpanByNow(final long millis, final int precision) {
521-
return getFitTimeSpan(System.currentTimeMillis(), millis, precision);
519+
return getFitTimeSpan(millis, System.currentTimeMillis(), precision);
522520
}
523521

524522
/**
@@ -1603,11 +1601,15 @@ private static long millis2TimeSpan(final long millis, @TimeConstants.Unit final
16031601
}
16041602

16051603
private static String millis2FitTimeSpan(long millis, int precision) {
1606-
if (millis < 0 || precision <= 0) return null;
1604+
if (precision <= 0) return null;
16071605
precision = Math.min(precision, 5);
16081606
String[] units = {"天", "小时", "分钟", "秒", "毫秒"};
16091607
if (millis == 0) return 0 + units[precision - 1];
16101608
StringBuilder sb = new StringBuilder();
1609+
if (millis < 0) {
1610+
sb.append("-");
1611+
millis = -millis;
1612+
}
16111613
int[] unitLen = {86400000, 3600000, 60000, 1000, 1};
16121614
for (int i = 0; i < precision; i++) {
16131615
if (millis >= unitLen[i]) {

0 commit comments

Comments
 (0)