see 09/08 log

cmj · cmj · commit de6ae5057cc3 · 2016-09-08T17:54:16.000+08:00
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/ImageUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/ImageUtils.java
@@ -28,14 +28,15 @@
 import android.renderscript.RenderScript;
 import android.renderscript.ScriptIntrinsicBlur;
 
+import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 
 /**
  * <pre>
@@ -121,32 +122,25 @@ public static Drawable bytes2Drawable(Resources resources, byte[] bytes) {
     /**
      * 根据文件路径获取bitmap
      *
-     * @param filePath 文件路径
+     * @param file 文件路径
      * @return bitmap
      */
-    public static Bitmap getBitmapByFile(String filePath) {
-        return getBitmapByFile(FileUtils.getFileByPath(filePath));
+    public static Bitmap getBitmapByFile(File file) {
+        if (file == null) return null;
+        return getBitmapByFile(file.getPath());
     }
 
     /**
      * 根据文件路径获取bitmap
      *
-     * @param file 文件路径
+     * @param filePath 文件路径
      * @return bitmap
      */
-    public static Bitmap getBitmapByFile(File file) {
-        if (file == null) return null;
-        try {
-            return BitmapFactory.decodeStream(new FileInputStream(file));
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-            return null;
-        }
+    public static Bitmap getBitmapByFile(String filePath) {
+        return BitmapFactory.decodeFile(filePath);
     }
 
     /**
-     * 根据文件路径获取bitmap
-     *
      * @param filePath 文件路径
      * @return bitmap
      */
@@ -166,24 +160,19 @@ public static int calculateInSampleSize(
         final int height = options.outHeight;
         final int width = options.outWidth;
         int inSampleSize = 1;
-
         if (height > reqHeight || width > reqWidth) {
-
             final int halfHeight = height / 2;
             final int halfWidth = width / 2;
-
             // Calculate the largest inSampleSize value that is a power of 2 and keeps both
             // height and width larger than the requested height and width.
             while ((halfHeight / inSampleSize) > reqHeight
                     && (halfWidth / inSampleSize) > reqWidth) {
-                inSampleSize *= 2;
+                inSampleSize <<= 1;
             }
         }
-
         return inSampleSize;
     }
 
-
     /**
      * 缩放图片
      *
@@ -735,17 +724,17 @@ public static boolean save(Bitmap src, String filePath, CompressFormat format) {
      * @return {@code true}: 成功<br>{@code false}: 失败
      */
     public static boolean save(Bitmap src, File file, CompressFormat format) {
-        if (isEmptyBitmap(src) || file == null) return false;
-        System.out.println(src.getWidth() + "," + src.getHeight());
-        FileOutputStream fos = null;
+        if (isEmptyBitmap(src) || !FileUtils.createOrExistsFile(file)) return false;
+        System.out.println(src.getWidth() + ", " + src.getHeight());
+        OutputStream os = null;
         try {
-            fos = new FileOutputStream(file);
-            return src.compress(format, 100, fos);
+            os = new BufferedOutputStream(new FileOutputStream(file));
+            return src.compress(format, 100, os);
         } catch (Exception e) {
             e.printStackTrace();
             return false;
         } finally {
-            FileUtils.closeIO(fos);
+            FileUtils.closeIO(os);
         }
     }
 
diff --git a/utilcode/src/test/java/com/blankj/utilcode/utils/ImageUtilsTest.java b/utilcode/src/test/java/com/blankj/utilcode/utils/ImageUtilsTest.java
@@ -26,9 +26,8 @@ public class ImageUtilsTest {
 
     @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));
+        System.out.println(ImageUtils.save(bitmap, path + "new.png", Bitmap.CompressFormat.PNG));
     }
 
     @Test
diff --git a/utilcode/src/test/res/image/lena.png b/utilcode/src/test/res/image/lena.png

Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,8 @@ public class ImageUtilsTest {`
`26`	`26`
`27`	`27`	`@Test`
`28`	`28`	`public void testBitmap2Bytes() throws Exception {`
`29`		`- FileUtils.createOrExistsFile(path + "new1.png");`
`30`	`29`	`Bitmap bitmap = ImageUtils.getBitmapByFile(path + "lena.png");`
`31`		`- System.out.println(ImageUtils.save(bitmap, path + "new1.png", Bitmap.CompressFormat.PNG));`
	`30`	`+ System.out.println(ImageUtils.save(bitmap, path + "new.png", Bitmap.CompressFormat.PNG));`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`@Test`