提交 16380316 编写于 作者: C cmj

see 08/31 log

上级 5418b184
......@@ -7,8 +7,8 @@ android {
defaultConfig {
minSdkVersion 11
targetSdkVersion 23
versionCode 6
versionName "1.1.4"
versionCode 7
versionName "1.1.5"
}
buildTypes {
release {
......
......@@ -911,7 +911,33 @@ public class FileUtils {
}
/**
* byte单位转换(单位:unit)
* 字节数转以unit为单位的size
*
* @param byteNum 大小
* @param unit <ul>
* <li>{@link MemoryUnit#BYTE}: 字节</li>
* <li>{@link MemoryUnit#KB} : 千字节</li>
* <li>{@link MemoryUnit#MB} : 兆</li>
* <li>{@link MemoryUnit#GB} : GB</li>
* </ul>
* @return 以unit为单位的size
*/
public static double byte2Size(long byteNum, MemoryUnit unit) {
switch (unit) {
default:
case BYTE:
return (double) byteNum / BYTE;
case KB:
return (double) byteNum / KB;
case MB:
return (double) byteNum / MB;
case GB:
return (double) byteNum / GB;
}
}
/**
* 以unit为单位的size转字节数
*
* @param size 大小
* @param unit <ul>
......@@ -920,20 +946,20 @@ public class FileUtils {
* <li>{@link MemoryUnit#MB} : 兆</li>
* <li>{@link MemoryUnit#GB} : GB</li>
* </ul>
* @return 大小以unit为单位
* @return 字节数
*/
public static double byte2Unit(long size, MemoryUnit unit) {
public static long size2Byte(long size, MemoryUnit unit) {
switch (unit) {
default:
case BYTE:
return (double) size / BYTE;
return size * BYTE;
case KB:
return (double) size / KB;
return size * KB;
case MB:
return (double) size / MB;
return size * MB;
case GB:
return (double) size / GB;
return size * GB;
}
return -1;
}
/**
......@@ -968,7 +994,7 @@ public class FileUtils {
*/
public static double getFileSize(File file, MemoryUnit unit) {
if (!isFileExists(file)) return -1;
return byte2Unit(file.length(), unit);
return byte2Size(file.length(), unit);
}
/**
......
......@@ -73,7 +73,7 @@ public class SDCardUtils {
availableBlocks = stat.getAvailableBlocks();
blockSize = stat.getBlockSize();
}
return FileUtils.byte2Unit(availableBlocks * blockSize, unit);
return FileUtils.byte2Size(availableBlocks * blockSize, unit);
} catch (Exception e) {
e.printStackTrace();
return -1.0;
......
......@@ -6,7 +6,35 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FilenameFilter;
import static com.blankj.utilcode.utils.FileUtils.*;
import static com.blankj.utilcode.utils.FileUtils.byte2Size;
import static com.blankj.utilcode.utils.FileUtils.copyDir;
import static com.blankj.utilcode.utils.FileUtils.copyFile;
import static com.blankj.utilcode.utils.FileUtils.createFileByDeleteOldFile;
import static com.blankj.utilcode.utils.FileUtils.createOrExistsDir;
import static com.blankj.utilcode.utils.FileUtils.createOrExistsFile;
import static com.blankj.utilcode.utils.FileUtils.deleteDir;
import static com.blankj.utilcode.utils.FileUtils.deleteFile;
import static com.blankj.utilcode.utils.FileUtils.getDirName;
import static com.blankj.utilcode.utils.FileUtils.getFileByPath;
import static com.blankj.utilcode.utils.FileUtils.getFileCharsetSimple;
import static com.blankj.utilcode.utils.FileUtils.getFileExtension;
import static com.blankj.utilcode.utils.FileUtils.getFileLines;
import static com.blankj.utilcode.utils.FileUtils.getFileName;
import static com.blankj.utilcode.utils.FileUtils.getFileNameNoExtension;
import static com.blankj.utilcode.utils.FileUtils.getFileSize;
import static com.blankj.utilcode.utils.FileUtils.isDir;
import static com.blankj.utilcode.utils.FileUtils.isFile;
import static com.blankj.utilcode.utils.FileUtils.isFileExists;
import static com.blankj.utilcode.utils.FileUtils.listFilesInDir;
import static com.blankj.utilcode.utils.FileUtils.listFilesInDirWithFilter;
import static com.blankj.utilcode.utils.FileUtils.moveDir;
import static com.blankj.utilcode.utils.FileUtils.moveFile;
import static com.blankj.utilcode.utils.FileUtils.readFile2Bytes;
import static com.blankj.utilcode.utils.FileUtils.readFile2List;
import static com.blankj.utilcode.utils.FileUtils.readFile2String;
import static com.blankj.utilcode.utils.FileUtils.searchFileInDir;
import static com.blankj.utilcode.utils.FileUtils.writeFileFromIS;
import static com.blankj.utilcode.utils.FileUtils.writeFileFromString;
import static com.blankj.utilcode.utils.TestUtils.BASEPATH;
import static com.blankj.utilcode.utils.TestUtils.SEP;
import static com.google.common.truth.Truth.assertThat;
......@@ -187,7 +215,7 @@ public class FileUtilsTest {
@Test
public void testByte2Unit() throws Exception {
assertThat(byte2Unit(ConstUtils.GB, ConstUtils.MemoryUnit.MB) - 1024).isWithin(0.001);
assertThat(byte2Size(ConstUtils.GB, ConstUtils.MemoryUnit.MB) - 1024).isWithin(0.001);
}
@Test
......
package com.blankj.utilcode.utils;
import android.graphics.Bitmap;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import static com.blankj.utilcode.utils.TestUtils.BASEPATH;
import static com.blankj.utilcode.utils.TestUtils.SEP;
/**
* <pre>
* author: Blankj
* blog : http://blankj.com
* time : 2016/8/30
* desc : ImageUtils单元测试
* </pre>
*/
@RunWith(RobolectricTestRunner.class)
@Config(manifest = Config.NONE)
public class ImageUtilsTest {
String path = BASEPATH + "image" + SEP;
@Test
public void testBitmap2Bytes() throws Exception {
FileUtils.createOrExistsFile(path + "new1.png");
Bitmap bitmap = ImageUtils.getBitmapByFile(path + "lena.png");
System.out.println(ImageUtils.save(bitmap, path + "new1.png", Bitmap.CompressFormat.PNG));
}
@Test
public void testBytes2Bitmap() throws Exception {
}
@Test
public void testDrawable2Bitmap() throws Exception {
}
@Test
public void testBitmap2Drawable() throws Exception {
}
@Test
public void testDrawable2Bytes() throws Exception {
}
@Test
public void testBytes2Drawable() throws Exception {
}
@Test
public void testGetBitmap() throws Exception {
}
@Test
public void testScaleImage() throws Exception {
}
@Test
public void testToRound() throws Exception {
}
@Test
public void testToRoundCorner() throws Exception {
}
@Test
public void testFastBlur() throws Exception {
}
@Test
public void testRenderScriptBlur() throws Exception {
}
@Test
public void testStackBlur() throws Exception {
}
@Test
public void testAddFrame() throws Exception {
}
@Test
public void testAddReflection() throws Exception {
}
@Test
public void testSaveBitmap() throws Exception {
}
}
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册