see 08/25 log

Blankj · Blankj · commit d54904ec0c20 · 2016-08-25T23:38:30.000+08:00
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/ConstUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/ConstUtils.java
@@ -15,6 +15,12 @@ private ConstUtils() {
     }
 
     /******************** 存储相关常量 ********************/
+    public enum MemoryUnit {
+        BYTE,
+        KB,
+        MB,
+        GB,
+    }
     /**
      * Byte与Byte的倍数
      */
@@ -33,6 +39,13 @@ private ConstUtils() {
     public static final int GB = 1073741824;
 
     /******************** 时间相关常量 ********************/
+    public enum TimeUnit {
+        MSEC,
+        SEC,
+        MIN,
+        HOUR,
+        DAY
+    }
     /**
      * 毫秒与毫秒的倍数
      */
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/FileUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/FileUtils.java
@@ -19,6 +19,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import static com.blankj.utilcode.utils.ConstUtils.*;
 import static com.blankj.utilcode.utils.ConstUtils.KB;
 
 /**
@@ -901,20 +902,23 @@ public static byte[] readFile2Bytes(File file) {
      *
      * @param size 大小
      * @param unit <ul>
-     *             <li>{@link ConstUtils#BYTE}: 字节</li>
-     *             <li>{@link ConstUtils#KB}  : 千字节</li>
-     *             <li>{@link ConstUtils#MB}  : 兆</li>
-     *             <li>{@link ConstUtils#GB}  : GB</li>
+     *             <li>{@link MemoryUnit#BYTE}: 字节</li>
+     *             <li>{@link MemoryUnit#KB}  : 千字节</li>
+     *             <li>{@link MemoryUnit#MB}  : 兆</li>
+     *             <li>{@link MemoryUnit#GB}  : GB</li>
      *             </ul>
      * @return 大小以unit为单位
      */
-    public static double byte2Unit(long size, int unit) {
+    public static double byte2Unit(long size, MemoryUnit unit) {
         switch (unit) {
-            case ConstUtils.BYTE:
-            case ConstUtils.KB:
-            case ConstUtils.MB:
-            case ConstUtils.GB:
-                return (double) size / unit;
+            case BYTE:
+                return (double) size / BYTE;
+            case KB:
+                return (double) size / KB;
+            case MB:
+                return (double) size / MB;
+            case GB:
+                return (double) size / GB;
         }
         return -1;
     }
@@ -925,14 +929,14 @@ public static double byte2Unit(long size, int unit) {
      *
      * @param filePath 文件路径
      * @param unit     <ul>
-     *                 <li>{@link ConstUtils#BYTE}: 字节</li>
-     *                 <li>{@link ConstUtils#KB}  : 千字节</li>
-     *                 <li>{@link ConstUtils#MB}  : 兆</li>
-     *                 <li>{@link ConstUtils#GB}  : GB</li>
+     *                 <li>{@link MemoryUnit#BYTE}: 字节</li>
+     *                 <li>{@link MemoryUnit#KB}  : 千字节</li>
+     *                 <li>{@link MemoryUnit#MB}  : 兆</li>
+     *                 <li>{@link MemoryUnit#GB}  : GB</li>
      *                 </ul>
      * @return 文件大小以unit为单位
      */
-    public static double getFileSize(String filePath, int unit) {
+    public static double getFileSize(String filePath, MemoryUnit unit) {
         return getFileSize(getFileByPath(filePath), unit);
     }
 
@@ -942,14 +946,14 @@ public static double getFileSize(String filePath, int unit) {
      *
      * @param file 文件
      * @param unit <ul>
-     *             <li>{@link ConstUtils#BYTE}: 字节</li>
-     *             <li>{@link ConstUtils#KB}  : 千字节</li>
-     *             <li>{@link ConstUtils#MB}  : 兆</li>
-     *             <li>{@link ConstUtils#GB}  : GB</li>
+     *             <li>{@link MemoryUnit#BYTE}: 字节</li>
+     *             <li>{@link MemoryUnit#KB}  : 千字节</li>
+     *             <li>{@link MemoryUnit#MB}  : 兆</li>
+     *             <li>{@link MemoryUnit#GB}  : GB</li>
      *             </ul>
      * @return 文件大小以unit为单位
      */
-    public static double getFileSize(File file, int unit) {
+    public static double getFileSize(File file, MemoryUnit unit) {
         if (!isFileExists(file)) return -1;
         return byte2Unit(file.length(), unit);
     }
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/TimeUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/TimeUtils.java
@@ -5,6 +5,8 @@
 import java.util.Date;
 import java.util.Locale;
 
+import static com.blankj.utilcode.utils.ConstUtils.*;
+
 
 /**
  * <pre>
@@ -28,7 +30,8 @@ private TimeUtils() {
      * 表示单引号。所有其他字符均不解释；只是在格式化时将它们简单复制到输出字符串，或者在分析时与输入字符串进行匹配。
      * </p>
      * 定义了以下模式字母（所有其他字符 'A' 到 'Z' 和 'a' 到 'z' 都被保留）： <br>
-     * <table border="1" cellspacing="1" cellpadding="1" summary="Chart shows pattern letters, date/time component, presentation, and examples.">
+     * <table border="1" cellspacing="1" cellpadding="1" summary="Chart shows pattern letters, date/time component,
+     * presentation, and examples.">
      * <tr>
      * <th align="left">字母</th>
      * <th align="left">日期或时间元素</th>
@@ -300,22 +303,26 @@ public static Date milliseconds2Date(long milliseconds) {
      *
      * @param milliseconds 毫秒时间戳
      * @param unit         <ul>
-     *                     <li>{@link ConstUtils#MSEC}: 毫秒</li>
-     *                     <li>{@link ConstUtils#SEC }: 秒</li>
-     *                     <li>{@link ConstUtils#MIN }: 分</li>
-     *                     <li>{@link ConstUtils#HOUR}: 小时</li>
-     *                     <li>{@link ConstUtils#DAY }: 天</li>
+     *                     <li>{@link TimeUnit#MSEC}: 毫秒</li>
+     *                     <li>{@link TimeUnit#SEC }: 秒</li>
+     *                     <li>{@link TimeUnit#MIN }: 分</li>
+     *                     <li>{@link TimeUnit#HOUR}: 小时</li>
+     *                     <li>{@link TimeUnit#DAY }: 天</li>
      *                     </ul>
      * @return unit时间戳
      */
-    private static long milliseconds2Unit(long milliseconds, int unit) {
+    private static long milliseconds2Unit(long milliseconds, TimeUnit unit) {
         switch (unit) {
-            case ConstUtils.MSEC:
-            case ConstUtils.SEC:
-            case ConstUtils.MIN:
-            case ConstUtils.HOUR:
-            case ConstUtils.DAY:
-                return milliseconds / unit;
+            case MSEC:
+                return milliseconds / MSEC;
+            case SEC:
+                return milliseconds / SEC;
+            case MIN:
+                return milliseconds / MIN;
+            case HOUR:
+                return milliseconds / HOUR;
+            case DAY:
+                return milliseconds / DAY;
         }
         return -1;
     }
@@ -327,15 +334,15 @@ private static long milliseconds2Unit(long milliseconds, int unit) {
      * @param time0 时间字符串1
      * @param time1 时间字符串2
      * @param unit  <ul>
-     *              <li>{@link ConstUtils#MSEC}: 毫秒</li>
-     *              <li>{@link ConstUtils#SEC }: 秒</li>
-     *              <li>{@link ConstUtils#MIN }: 分</li>
-     *              <li>{@link ConstUtils#HOUR}: 小时</li>
-     *              <li>{@link ConstUtils#DAY }: 天</li>
+     *              <li>{@link TimeUnit#MSEC}: 毫秒</li>
+     *              <li>{@link TimeUnit#SEC }: 秒</li>
+     *              <li>{@link TimeUnit#MIN }: 分</li>
+     *              <li>{@link TimeUnit#HOUR}: 小时</li>
+     *              <li>{@link TimeUnit#DAY }: 天</li>
      *              </ul>
      * @return unit时间戳
      */
-    public static long getIntervalTime(String time0, String time1, int unit) {
+    public static long getIntervalTime(String time0, String time1, TimeUnit unit) {
         return getIntervalTime(time0, time1, unit, DEFAULT_SDF);
     }
 
@@ -346,16 +353,16 @@ public static long getIntervalTime(String time0, String time1, int unit) {
      * @param time0  时间字符串1
      * @param time1  时间字符串2
      * @param unit   <ul>
-     *               <li>{@link ConstUtils#MSEC}: 毫秒</li>
-     *               <li>{@link ConstUtils#SEC }: 秒</li>
-     *               <li>{@link ConstUtils#MIN }: 分</li>
-     *               <li>{@link ConstUtils#HOUR}: 小时</li>
-     *               <li>{@link ConstUtils#DAY }: 天</li>
+     *               <li>{@link TimeUnit#MSEC}: 毫秒</li>
+     *               <li>{@link TimeUnit#SEC }: 秒</li>
+     *               <li>{@link TimeUnit#MIN }: 分</li>
+     *               <li>{@link TimeUnit#HOUR}: 小时</li>
+     *               <li>{@link TimeUnit#DAY }: 天</li>
      *               </ul>
      * @param format 时间格式
      * @return unit时间戳
      */
-    public static long getIntervalTime(String time0, String time1, int unit, SimpleDateFormat format) {
+    public static long getIntervalTime(String time0, String time1, TimeUnit unit, SimpleDateFormat format) {
         return Math.abs(milliseconds2Unit(string2Milliseconds(time0, format)
                 - string2Milliseconds(time1, format), unit));
     }
@@ -367,15 +374,15 @@ public static long getIntervalTime(String time0, String time1, int unit, SimpleD
      * @param time0 Date类型时间1
      * @param time1 Date类型时间2
      * @param unit  <ul>
-     *              <li>{@link ConstUtils#MSEC}: 毫秒</li>
-     *              <li>{@link ConstUtils#SEC }: 秒</li>
-     *              <li>{@link ConstUtils#MIN }: 分</li>
-     *              <li>{@link ConstUtils#HOUR}: 小时</li>
-     *              <li>{@link ConstUtils#DAY }: 天</li>
+     *              <li>{@link TimeUnit#MSEC}: 毫秒</li>
+     *              <li>{@link TimeUnit#SEC }: 秒</li>
+     *              <li>{@link TimeUnit#MIN }: 分</li>
+     *              <li>{@link TimeUnit#HOUR}: 小时</li>
+     *              <li>{@link TimeUnit#DAY }: 天</li>
      *              </ul>
      * @return unit时间戳
      */
-    public static long getIntervalTime(Date time0, Date time1, int unit) {
+    public static long getIntervalTime(Date time0, Date time1, TimeUnit unit) {
         return Math.abs(milliseconds2Unit(date2Milliseconds(time1)
                 - date2Milliseconds(time0), unit));
     }
@@ -426,15 +433,15 @@ public static Date getCurTimeDate() {
      *
      * @param time 时间字符串
      * @param unit <ul>
-     *             <li>{@link ConstUtils#MSEC}:毫秒</li>
-     *             <li>{@link ConstUtils#SEC }:秒</li>
-     *             <li>{@link ConstUtils#MIN }:分</li>
-     *             <li>{@link ConstUtils#HOUR}:小时</li>
-     *             <li>{@link ConstUtils#DAY }:天</li>
+     *             <li>{@link TimeUnit#MSEC}:毫秒</li>
+     *             <li>{@link TimeUnit#SEC }:秒</li>
+     *             <li>{@link TimeUnit#MIN }:分</li>
+     *             <li>{@link TimeUnit#HOUR}:小时</li>
+     *             <li>{@link TimeUnit#DAY }:天</li>
      *             </ul>
      * @return unit时间戳
      */
-    public static long getIntervalByNow(String time, int unit) {
+    public static long getIntervalByNow(String time, TimeUnit unit) {
         return getIntervalByNow(time, unit, DEFAULT_SDF);
     }
 
@@ -444,16 +451,16 @@ public static long getIntervalByNow(String time, int unit) {
      *
      * @param time   时间字符串
      * @param unit   <ul>
-     *               <li>{@link ConstUtils#MSEC}: 毫秒</li>
-     *               <li>{@link ConstUtils#SEC }: 秒</li>
-     *               <li>{@link ConstUtils#MIN }: 分</li>
-     *               <li>{@link ConstUtils#HOUR}: 小时</li>
-     *               <li>{@link ConstUtils#DAY }: 天</li>
+     *               <li>{@link TimeUnit#MSEC}: 毫秒</li>
+     *               <li>{@link TimeUnit#SEC }: 秒</li>
+     *               <li>{@link TimeUnit#MIN }: 分</li>
+     *               <li>{@link TimeUnit#HOUR}: 小时</li>
+     *               <li>{@link TimeUnit#DAY }: 天</li>
      *               </ul>
      * @param format 时间格式
      * @return unit时间戳
      */
-    public static long getIntervalByNow(String time, int unit, SimpleDateFormat format) {
+    public static long getIntervalByNow(String time, TimeUnit unit, SimpleDateFormat format) {
         return getIntervalTime(getCurTimeString(), time, unit, format);
     }
 
@@ -463,15 +470,15 @@ public static long getIntervalByNow(String time, int unit, SimpleDateFormat form
      *
      * @param time Date类型时间
      * @param unit <ul>
-     *             <li>{@link ConstUtils#MSEC}: 毫秒</li>
-     *             <li>{@link ConstUtils#SEC }: 秒</li>
-     *             <li>{@link ConstUtils#MIN }: 分</li>
-     *             <li>{@link ConstUtils#HOUR}: 小时</li>
-     *             <li>{@link ConstUtils#DAY }: 天</li>
+     *             <li>{@link TimeUnit#MSEC}: 毫秒</li>
+     *             <li>{@link TimeUnit#SEC }: 秒</li>
+     *             <li>{@link TimeUnit#MIN }: 分</li>
+     *             <li>{@link TimeUnit#HOUR}: 小时</li>
+     *             <li>{@link TimeUnit#DAY }: 天</li>
      *             </ul>
      * @return unit时间戳
      */
-    public static long getIntervalByNow(Date time, int unit) {
+    public static long getIntervalByNow(Date time, TimeUnit unit) {
         return getIntervalTime(getCurTimeDate(), time, unit);
     }
 
diff --git a/utilcode/src/test/java/com/blankj/utilcode/utils/FileUtilsTest.java b/utilcode/src/test/java/com/blankj/utilcode/utils/FileUtilsTest.java
@@ -26,6 +26,7 @@ public class FileUtilsTest {
 
     @Test
     public void testGetFileByPath() throws Exception {
+        System.out.println(new byte[0].length);
         assertThat(getFileByPath(" ")).isNull();
         assertThat(getFileByPath("c:")).isNotNull();
     }
@@ -186,12 +187,12 @@ public void testReadFile2Bytes() throws Exception {
 
     @Test
     public void testByte2Unit() throws Exception {
-        assertThat(byte2Unit(ConstUtils.GB, ConstUtils.MB) - 1024).isWithin(0.001);
+        assertThat(byte2Unit(ConstUtils.GB, ConstUtils.MemoryUnit.MB) - 1024).isWithin(0.001);
     }
 
     @Test
     public void testGetFileSize() throws Exception {
-        assertThat(getFileSize(path + "UTF8.txt", ConstUtils.BYTE) - 25).isWithin(0.001);
+        assertThat(getFileSize(path + "UTF8.txt", ConstUtils.MemoryUnit.BYTE) - 25).isWithin(0.001);
     }
 
     @Test
diff --git a/utilcode/src/test/java/com/blankj/utilcode/utils/TimeUtilsTest.java b/utilcode/src/test/java/com/blankj/utilcode/utils/TimeUtilsTest.java
@@ -68,9 +68,9 @@ public void testMilliseconds2Date() throws Exception {
 
     @Test
     public void testGetIntervalTime() throws Exception {
-        assertThat(getIntervalTime(timeString0, timeString1, ConstUtils.SEC)).isEqualTo(4210);
-        assertThat(getIntervalTime(myTimeString0, myTimeString1, ConstUtils.SEC, myFormat)).isEqualTo(4210);
-        assertThat(getIntervalTime(new Date(4210000), new Date(0), ConstUtils.SEC)).isEqualTo(4210);
+        assertThat(getIntervalTime(timeString0, timeString1, ConstUtils.TimeUnit.SEC)).isEqualTo(4210);
+        assertThat(getIntervalTime(myTimeString0, myTimeString1, ConstUtils.TimeUnit.SEC, myFormat)).isEqualTo(4210);
+        assertThat(getIntervalTime(new Date(4210000), new Date(0), ConstUtils.TimeUnit.SEC)).isEqualTo(4210);
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ public class FileUtilsTest {`
`26`	`26`
`27`	`27`	`@Test`
`28`	`28`	`public void testGetFileByPath() throws Exception {`
	`29`	`+ System.out.println(new byte[0].length);`
`29`	`30`	`assertThat(getFileByPath(" ")).isNull();`
`30`	`31`	`assertThat(getFileByPath("c:")).isNotNull();`
`31`	`32`	`}`
`@@ -186,12 +187,12 @@ public void testReadFile2Bytes() throws Exception {`
`186`	`187`
`187`	`188`	`@Test`
`188`	`189`	`public void testByte2Unit() throws Exception {`
`189`		`- assertThat(byte2Unit(ConstUtils.GB, ConstUtils.MB) - 1024).isWithin(0.001);`
	`190`	`+ assertThat(byte2Unit(ConstUtils.GB, ConstUtils.MemoryUnit.MB) - 1024).isWithin(0.001);`
`190`	`191`	`}`
`191`	`192`
`192`	`193`	`@Test`
`193`	`194`	`public void testGetFileSize() throws Exception {`
`194`		`- assertThat(getFileSize(path + "UTF8.txt", ConstUtils.BYTE) - 25).isWithin(0.001);`
	`195`	`+ assertThat(getFileSize(path + "UTF8.txt", ConstUtils.MemoryUnit.BYTE) - 25).isWithin(0.001);`
`195`	`196`	`}`
`196`	`197`
`197`	`198`	`@Test`