see 05/28 log

Blankj · Blankj · commit f835ce550750 · 2018-05-29T14:06:10.000+08:00
diff --git a/README-CN.md b/README-CN.md
@@ -41,7 +41,7 @@
 
 [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
 
-[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.16.1-brightgreen.svg
+[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.16.2-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ If this project helps you a lot and you want to support the project's developmen
 
 [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
 
-[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.16.1-brightgreen.svg
+[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.16.2-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg
diff --git a/app/build.gradle b/app/build.gradle
@@ -56,7 +56,7 @@ dependencies {
     // LeakCanary
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanary_version"
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary_version"
-//    implementation 'com.blankj:utilcode:1.16.1'
+//    implementation 'com.blankj:utilcode:1.16.2'
 }
 
 
diff --git a/build.gradle b/build.gradle
@@ -44,8 +44,8 @@ ext {
     min_sdk_version = 14
     target_sdk_version = 27
 
-    version_code = 1_016_001
-    version_name = '1.16.1'// E.g 1.9.72 => 1,009,072
+    version_code = 1_016_002
+    version_name = '1.16.2'// E.g 1.9.72 => 1,009,072
 
     // App dependencies
     support_version = '27.1.0'
diff --git a/update_log.md b/update_log.md
@@ -1,3 +1,4 @@
+* 18/05/29 完善 TimeUtils 的 timeSpan 带符号位，ToastUtils 去除弱引用，发布 1.16.2 版本
 * 18/05/25 新增 AppUtils#registerAppStatusChangedListener 和 AppUtils#unregisterAppStatusChangedListener，发布 1.16.1 版本
 * 18/05/22 新增 ThreadUtils，发布 1.16.0 版本
 * 18/05/15 新增 MetaDataUtils 和 ActivityUtils#startActivityForResult，发布 1.15.1 版本
diff --git a/utilcode/README-CN.md b/utilcode/README-CN.md
@@ -2,7 +2,7 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.16.1'
+implementation 'com.blankj:utilcode:1.16.2'
 ```
 
 
diff --git a/utilcode/README.md b/utilcode/README.md
@@ -2,7 +2,7 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.16.1'
+implementation 'com.blankj:utilcode:1.16.2'
 ```
 
 
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/FileIOUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/FileIOUtils.java
@@ -31,12 +31,12 @@
  */
 public final class FileIOUtils {
 
+    private static int sBufferSize = 8192;
+
     private FileIOUtils() {
         throw new UnsupportedOperationException("u can't instantiate me...");
     }
 
-    private static int sBufferSize = 8192;
-
     /**
      * Write file from input stream.
      *
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/FileUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/FileUtils.java
@@ -27,12 +27,12 @@
  */
 public final class FileUtils {
 
+    private static final String LINE_SEP = System.getProperty("line.separator");
+
     private FileUtils() {
         throw new UnsupportedOperationException("u can't instantiate me...");
     }
 
-    private static final String LINE_SEP = System.getProperty("line.separator");
-
     /**
      * Return the file by path.
      *
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/LogUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/LogUtils.java
@@ -72,8 +72,10 @@ public final class LogUtils {
     private static final String MIDDLE_CORNER  = "├";
     private static final String LEFT_BORDER    = "│ ";
     private static final String BOTTOM_CORNER  = "└";
-    private static final String SIDE_DIVIDER   = "────────────────────────────────────────────────────────";
-    private static final String MIDDLE_DIVIDER = "┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄";
+    private static final String SIDE_DIVIDER   =
+            "────────────────────────────────────────────────────────";
+    private static final String MIDDLE_DIVIDER =
+            "┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄";
     private static final String TOP_BORDER     = TOP_CORNER + SIDE_DIVIDER + SIDE_DIVIDER;
     private static final String MIDDLE_BORDER  = MIDDLE_CORNER + MIDDLE_DIVIDER + MIDDLE_DIVIDER;
     private static final String BOTTOM_BORDER  = BOTTOM_CORNER + SIDE_DIVIDER + SIDE_DIVIDER;
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/SPUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/SPUtils.java
@@ -21,7 +21,7 @@
 @SuppressLint("ApplySharedPref")
 public final class SPUtils {
 
-    private static SimpleArrayMap<String, SPUtils> SP_UTILS_MAP = new SimpleArrayMap<>();
+    private static final SimpleArrayMap<String, SPUtils> SP_UTILS_MAP = new SimpleArrayMap<>();
     private SharedPreferences sp;
 
     /**
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/ThreadUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/ThreadUtils.java
@@ -28,10 +28,10 @@
  */
 public final class ThreadUtils {
 
-    private static final Map<Integer, Map<Integer, ExecutorService>> TYPE_PRIORITY_POOLS
-            = new ConcurrentHashMap<>();
-    private static final Map<Task, ScheduledExecutorService>         TASK_SCHEDULED
-            = new ConcurrentHashMap<>();
+    private static final Map<Integer, Map<Integer, ExecutorService>> TYPE_PRIORITY_POOLS =
+            new ConcurrentHashMap<>();
+    private static final Map<Task, ScheduledExecutorService>         TASK_SCHEDULED      =
+            new ConcurrentHashMap<>();
 
     private static final byte TYPE_SINGLE = -1;
     private static final byte TYPE_CACHED = -2;
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/TimeUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/TimeUtils.java
@@ -189,9 +189,7 @@ public static long getTimeSpan(final String time1,
                                    final String time2,
                                    @NonNull final DateFormat format,
                                    @TimeConstants.Unit final int unit) {
-        return millis2TimeSpan(
-                Math.abs(string2Millis(time1, format) - string2Millis(time2, format)), unit
-        );
+        return millis2TimeSpan(string2Millis(time1, format) - string2Millis(time2, format), unit);
     }
 
     /**
@@ -212,7 +210,7 @@ public static long getTimeSpan(final String time1,
     public static long getTimeSpan(final Date date1,
                                    final Date date2,
                                    @TimeConstants.Unit final int unit) {
-        return millis2TimeSpan(Math.abs(date2Millis(date1) - date2Millis(date2)), unit);
+        return millis2TimeSpan(date2Millis(date1) - date2Millis(date2), unit);
     }
 
     /**
@@ -233,7 +231,7 @@ public static long getTimeSpan(final Date date1,
     public static long getTimeSpan(final long millis1,
                                    final long millis2,
                                    @TimeConstants.Unit final int unit) {
-        return millis2TimeSpan(Math.abs(millis1 - millis2), unit);
+        return millis2TimeSpan(millis1 - millis2, unit);
     }
 
     /**
@@ -257,7 +255,7 @@ public static String getFitTimeSpan(final String time1,
                                         final String time2,
                                         final int precision) {
         long delta = string2Millis(time1, DEFAULT_FORMAT) - string2Millis(time2, DEFAULT_FORMAT);
-        return millis2FitTimeSpan(Math.abs(delta), precision);
+        return millis2FitTimeSpan(delta, precision);
     }
 
     /**
@@ -282,7 +280,7 @@ public static String getFitTimeSpan(final String time1,
                                         @NonNull final DateFormat format,
                                         final int precision) {
         long delta = string2Millis(time1, format) - string2Millis(time2, format);
-        return millis2FitTimeSpan(Math.abs(delta), precision);
+        return millis2FitTimeSpan(delta, precision);
     }
 
     /**
@@ -302,7 +300,7 @@ public static String getFitTimeSpan(final String time1,
      * @return the fit time span
      */
     public static String getFitTimeSpan(final Date date1, final Date date2, final int precision) {
-        return millis2FitTimeSpan(Math.abs(date2Millis(date1) - date2Millis(date2)), precision);
+        return millis2FitTimeSpan(date2Millis(date1) - date2Millis(date2), precision);
     }
 
     /**
@@ -324,7 +322,7 @@ public static String getFitTimeSpan(final Date date1, final Date date2, final in
     public static String getFitTimeSpan(final long millis1,
                                         final long millis2,
                                         final int precision) {
-        return millis2FitTimeSpan(Math.abs(millis1 - millis2), precision);
+        return millis2FitTimeSpan(millis1 - millis2, precision);
     }
 
     /**
@@ -381,7 +379,7 @@ public static Date getNowDate() {
      * @return the time span by now, in unit
      */
     public static long getTimeSpanByNow(final String time, @TimeConstants.Unit final int unit) {
-        return getTimeSpan(getNowString(), time, DEFAULT_FORMAT, unit);
+        return getTimeSpan(time, getNowString(), DEFAULT_FORMAT, unit);
     }
 
     /**
@@ -402,7 +400,7 @@ public static long getTimeSpanByNow(final String time, @TimeConstants.Unit final
     public static long getTimeSpanByNow(final String time,
                                         @NonNull final DateFormat format,
                                         @TimeConstants.Unit final int unit) {
-        return getTimeSpan(getNowString(format), time, format, unit);
+        return getTimeSpan(time, getNowString(format), format, unit);
     }
 
     /**
@@ -420,7 +418,7 @@ public static long getTimeSpanByNow(final String time,
      * @return the time span by now, in unit
      */
     public static long getTimeSpanByNow(final Date date, @TimeConstants.Unit final int unit) {
-        return getTimeSpan(new Date(), date, unit);
+        return getTimeSpan(date, new Date(), unit);
     }
 
     /**
@@ -438,7 +436,7 @@ public static long getTimeSpanByNow(final Date date, @TimeConstants.Unit final i
      * @return the time span by now, in unit
      */
     public static long getTimeSpanByNow(final long millis, @TimeConstants.Unit final int unit) {
-        return getTimeSpan(System.currentTimeMillis(), millis, unit);
+        return getTimeSpan(millis, System.currentTimeMillis(), unit);
     }
 
     /**
@@ -458,7 +456,7 @@ public static long getTimeSpanByNow(final long millis, @TimeConstants.Unit final
      * @return the fit time span by now
      */
     public static String getFitTimeSpanByNow(final String time, final int precision) {
-        return getFitTimeSpan(getNowString(), time, DEFAULT_FORMAT, precision);
+        return getFitTimeSpan(time, getNowString(), DEFAULT_FORMAT, precision);
     }
 
     /**
@@ -480,7 +478,7 @@ public static String getFitTimeSpanByNow(final String time, final int precision)
     public static String getFitTimeSpanByNow(final String time,
                                              @NonNull final DateFormat format,
                                              final int precision) {
-        return getFitTimeSpan(getNowString(format), time, format, precision);
+        return getFitTimeSpan(time, getNowString(format) , format, precision);
     }
 
     /**
@@ -499,7 +497,7 @@ public static String getFitTimeSpanByNow(final String time,
      * @return the fit time span by now
      */
     public static String getFitTimeSpanByNow(final Date date, final int precision) {
-        return getFitTimeSpan(getNowDate(), date, precision);
+        return getFitTimeSpan(date, getNowDate(), precision);
     }
 
     /**
@@ -518,7 +516,7 @@ public static String getFitTimeSpanByNow(final Date date, final int precision) {
      * @return the fit time span by now
      */
     public static String getFitTimeSpanByNow(final long millis, final int precision) {
-        return getFitTimeSpan(System.currentTimeMillis(), millis, precision);
+        return getFitTimeSpan(millis, System.currentTimeMillis(), precision);
     }
 
     /**
@@ -1603,11 +1601,15 @@ private static long millis2TimeSpan(final long millis, @TimeConstants.Unit final
     }
 
     private static String millis2FitTimeSpan(long millis, int precision) {
-        if (millis < 0 || precision <= 0) return null;
+        if (precision <= 0) return null;
         precision = Math.min(precision, 5);
         String[] units = {"天", "小时", "分钟", "秒", "毫秒"};
         if (millis == 0) return 0 + units[precision - 1];
         StringBuilder sb = new StringBuilder();
+        if (millis < 0) {
+            sb.append("-");
+            millis = -millis;
+        }
         int[] unitLen = {86400000, 3600000, 60000, 1000, 1};
         for (int i = 0; i < precision; i++) {
             if (millis >= unitLen[i]) {
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/ToastUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/ToastUtils.java
diff --git a/utilcode/src/test/java/com/blankj/utilcode/util/TimeUtilsTest.java b/utilcode/src/test/java/com/blankj/utilcode/util/TimeUtilsTest.java

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ dependencies {`
`56`	`56`	`// LeakCanary`
`57`	`57`	`debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanary_version"`
`58`	`58`	`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'`
`60`	`60`	`}`
`61`	`61`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+* 18/05/29 完善 TimeUtils 的 timeSpan 带符号位，ToastUtils 去除弱引用，发布 1.16.2 版本`
`1`	`2`	`* 18/05/25 新增 AppUtils#registerAppStatusChangedListener 和 AppUtils#unregisterAppStatusChangedListener，发布 1.16.1 版本`
`2`	`3`	`* 18/05/22 新增 ThreadUtils，发布 1.16.0 版本`
`3`	`4`	`* 18/05/15 新增 MetaDataUtils 和 ActivityUtils#startActivityForResult，发布 1.15.1 版本`
Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,12 @@`
`31`	`31`	`*/`
`32`	`32`	`public final class FileIOUtils {`
`33`	`33`
	`34`	`+ private static int sBufferSize = 8192;`
	`35`	`+`
`34`	`36`	`private FileIOUtils() {`
`35`	`37`	`throw new UnsupportedOperationException("u can't instantiate me...");`
`36`	`38`	`}`
`37`	`39`
`38`		`- private static int sBufferSize = 8192;`
`39`		`-`
`40`	`40`	`/**`
`41`	`41`	`* Write file from input stream.`
`42`	`42`	`*`
Original file line number	Diff line number	Diff line change
`@@ -27,12 +27,12 @@`
`27`	`27`	`*/`
`28`	`28`	`public final class FileUtils {`
`29`	`29`
	`30`	`+ private static final String LINE_SEP = System.getProperty("line.separator");`
	`31`	`+`
`30`	`32`	`private FileUtils() {`
`31`	`33`	`throw new UnsupportedOperationException("u can't instantiate me...");`
`32`	`34`	`}`
`33`	`35`
`34`		`- private static final String LINE_SEP = System.getProperty("line.separator");`
`35`		`-`
`36`	`36`	`/**`
`37`	`37`	`* Return the file by path.`
`38`	`38`	`*`