Skip to content

Commit 1638031

Browse files
committed
see 08/31 log
1 parent 5418b18 commit 1638031

File tree

7 files changed

+781
-47
lines changed

7 files changed

+781
-47
lines changed

utilcode/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android {
77
defaultConfig {
88
minSdkVersion 11
99
targetSdkVersion 23
10-
versionCode 6
11-
versionName "1.1.4"
10+
versionCode 7
11+
versionName "1.1.5"
1212
}
1313
buildTypes {
1414
release {

utilcode/src/main/java/com/blankj/utilcode/utils/FileUtils.java

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,33 @@ public static byte[] readFile2Bytes(File file) {
911911
}
912912

913913
/**
914-
* byte单位转换(单位:unit)
914+
* 字节数转以unit为单位的size
915+
*
916+
* @param byteNum 大小
917+
* @param unit <ul>
918+
* <li>{@link MemoryUnit#BYTE}: 字节</li>
919+
* <li>{@link MemoryUnit#KB} : 千字节</li>
920+
* <li>{@link MemoryUnit#MB} : 兆</li>
921+
* <li>{@link MemoryUnit#GB} : GB</li>
922+
* </ul>
923+
* @return 以unit为单位的size
924+
*/
925+
public static double byte2Size(long byteNum, MemoryUnit unit) {
926+
switch (unit) {
927+
default:
928+
case BYTE:
929+
return (double) byteNum / BYTE;
930+
case KB:
931+
return (double) byteNum / KB;
932+
case MB:
933+
return (double) byteNum / MB;
934+
case GB:
935+
return (double) byteNum / GB;
936+
}
937+
}
938+
939+
/**
940+
* 以unit为单位的size转字节数
915941
*
916942
* @param size 大小
917943
* @param unit <ul>
@@ -920,20 +946,20 @@ public static byte[] readFile2Bytes(File file) {
920946
* <li>{@link MemoryUnit#MB} : 兆</li>
921947
* <li>{@link MemoryUnit#GB} : GB</li>
922948
* </ul>
923-
* @return 大小以unit为单位
949+
* @return 字节数
924950
*/
925-
public static double byte2Unit(long size, MemoryUnit unit) {
951+
public static long size2Byte(long size, MemoryUnit unit) {
926952
switch (unit) {
953+
default:
927954
case BYTE:
928-
return (double) size / BYTE;
955+
return size * BYTE;
929956
case KB:
930-
return (double) size / KB;
957+
return size * KB;
931958
case MB:
932-
return (double) size / MB;
959+
return size * MB;
933960
case GB:
934-
return (double) size / GB;
961+
return size * GB;
935962
}
936-
return -1;
937963
}
938964

939965
/**
@@ -968,7 +994,7 @@ public static double getFileSize(String filePath, MemoryUnit unit) {
968994
*/
969995
public static double getFileSize(File file, MemoryUnit unit) {
970996
if (!isFileExists(file)) return -1;
971-
return byte2Unit(file.length(), unit);
997+
return byte2Size(file.length(), unit);
972998
}
973999

9741000
/**

0 commit comments

Comments
 (0)