see 08/27 log

Author: Blankj

README.md

@@ -18,14 +18,18 @@
 >  - 正则相关常量
 
 > - **转换相关→[ConvertUtils.java][convert.java]→[Test][convert.test]**
->  - 每1个byte转为2个hex字符 *bytes2HexString*
->  - 每2个hex字符转为1个byte *hexString2Bytes*
+>  - byteArr转hexString *bytes2HexString*
+>  - hexString转byteArr *hexString2Bytes*
 >  - charArr转byteArr *chars2Bytes*
 >  - byteArr转charArr *bytes2Chars*
->  - 将输入流转为字节数组 *inputStream2Bytes*
->  - 将字节数组转为输入流 *bytes2InputStream*
->  - 指定编码将输入流转为字符串 *inputStream2String*
->  - 指定编码将字符串转为输入流 *string2InputStream*
+>  - inputStream转byteArr *inputStream2Bytes*
+>  - byteArr转inputStream *bytes2InputStream*
+>  - inputStream转string按编码 *inputStream2String*
+>  - string转inputStream按编码 *string2InputStream*
+>  - bitmap转byteArr *bitmap2Bytes*
+>  - byteArr转bitmap *bytes2Bitmap*
+>  - drawable转bitmap *drawable2Bitmap*
+>  - bitmap转drawable *bitmap2Drawable*
 
 > - **设备相关→[DeviceUtils.java][device.java]**
 >  - 获取设备MAC地址 *getMacAddress*

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

@@ -1,5 +1,11 @@
 package com.blankj.utilcode.utils;
 
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -21,24 +27,24 @@ public class ConvertUtils {
     static final char hexDigits[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
 
     /**
-     * 每1个byte转为2个hex字符
+     * byteArr转hexString
      * <p>例如：</p>
      * bytes2HexString(new byte[] { 0, (byte) 0xa8 }) returns 00A8
      *
-     * @param src byte数组
+     * @param bytes byte数组
      * @return 16进制大写字符串
      */
-    public static String bytes2HexString(byte[] src) {
-        char[] res = new char[src.length << 1];
-        for (int i = 0, j = 0; i < src.length; i++) {
-            res[j++] = hexDigits[src[i] >>> 4 & 0x0f];
-            res[j++] = hexDigits[src[i] & 0x0f];
+    public static String bytes2HexString(byte[] bytes) {
+        char[] res = new char[bytes.length << 1];
+        for (int i = 0, j = 0; i < bytes.length; i++) {
+            res[j++] = hexDigits[bytes[i] >>> 4 & 0x0f];
+            res[j++] = hexDigits[bytes[i] & 0x0f];
         }
         return new String(res);
     }
 
     /**
-     * 每2个hex字符转为1个byte
+     * hexString转byteArr
      * <p>例如：</p>
      * hexString2Bytes("00A8") returns { 0, (byte) 0xA8 }
      *
@@ -59,7 +65,7 @@ public static byte[] hexString2Bytes(String hexString) {
     }
 
     /**
-     * 单个hex字符转为10进制
+     * hexChar转int
      *
      * @param hexChar hex单个字节
      * @return 0..15
@@ -105,7 +111,7 @@ public static char[] bytes2Chars(byte[] bytes) {
     }
 
     /**
-     * 将输入流转为字节数组
+     * inputStream转byteArr
      *
      * @param is 输入流
      * @return 字节数组
@@ -129,7 +135,7 @@ public static byte[] inputStream2Bytes(InputStream is) {
     }
 
     /**
-     * 将字节数组转为输入流
+     * byteArr转inputStream
      *
      * @param bytes 字节数组
      * @return 输入流
@@ -139,7 +145,7 @@ public static InputStream bytes2InputStream(byte[] bytes) {
     }
 
     /**
-     * 指定编码将输入流转为字符串
+     * inputStream转string按编码
      *
      * @param is          输入流
      * @param charsetName 编码格式
@@ -170,7 +176,7 @@ public static String inputStream2String(InputStream is, String charsetName) {
     }
 
     /**
-     * 指定编码将字符串转为输入流
+     * string转inputStream按编码
      *
      * @param string      字符串
      * @param charsetName 编码格式
@@ -185,4 +191,49 @@ public static InputStream string2InputStream(String string, String charsetName)
             return null;
         }
     }
+
+    /**
+     * bitmap转byteArr
+     *
+     * @param bitmap bitmap对象
+     * @param format 图片格式
+     * @return 字节数组
+     */
+    public static byte[] bitmap2Bytes(Bitmap bitmap, Bitmap.CompressFormat format) {
+        if (bitmap == null) return null;
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        bitmap.compress(format, 100, baos);
+        return baos.toByteArray();
+    }
+
+    /**
+     * byteArr转bitmap
+     *
+     * @param bytes 字节数组
+     * @return bitmap对象
+     */
+    public static Bitmap bytes2Bitmap(byte[] bytes) {
+        return (bytes == null || bytes.length == 0) ? null : BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
+    }
+
+    /**
+     * drawable转bitmap
+     *
+     * @param drawable drawable对象
+     * @return bitmap对象
+     */
+    public static Bitmap drawable2Bitmap(Drawable drawable) {
+        return drawable == null ? null : ((BitmapDrawable) drawable).getBitmap();
+    }
+
+    /**
+     * bitmap转drawable
+     *
+     * @param resources resources对象
+     * @param bitmap    bitmap对象
+     * @return drawable对象
+     */
+    public static Drawable bitmap2Drawable(Resources resources, Bitmap bitmap) {
+        return bitmap == null ? null : new BitmapDrawable(resources, bitmap);
+    }
 }

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

@@ -655,8 +655,7 @@ public static boolean writeFileFromIS(File file, InputStream is, boolean append)
             e.printStackTrace();
             return false;
         } finally {
-            closeIO(is);
-            closeIO(os);
+            closeIO(is, os);
         }
     }
 
@@ -961,12 +960,16 @@ public static double getFileSize(File file, MemoryUnit unit) {
     /**
      * 关闭IO
      *
-     * @param closeable closeable
+     * @param closeables closeable
      */
-    public static void closeIO(Closeable closeable) {
-        if (closeable == null) return;
+    public static void closeIO(Closeable... closeables) {
+        if (closeables == null) return;
         try {
-            closeable.close();
+            for (Closeable closeable : closeables) {
+                if (closeable != null) {
+                    closeable.close();
+                }
+            }
         } catch (IOException e) {
             e.printStackTrace();
         }

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

@@ -5,6 +5,8 @@
 
 import java.io.File;
 
+import static com.blankj.utilcode.utils.ConstUtils.*;
+
 /**
  * <pre>
  *     author: Blankj
@@ -61,14 +63,14 @@ public static String getRootDirectoryPath() {
      * 计算SD卡的剩余空间
      *
      * @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 返回-1，说明SD卡不可用，否则返回SD卡剩余空间
      */
-    public static double getFreeSpace(int unit) {
+    public static double getFreeSpace(MemoryUnit unit) {
         if (isSDCardEnable()) {
             try {
                 StatFs stat = new StatFs(getSDCardPath());

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

@@ -76,6 +76,7 @@ public void execute(Runnable command) {
 
     /**
      * 在未来某个时间执行给定的命令链表
+     * <p>该命令可能在新的线程、已入池的线程或者正调用的线程中执行，这由 Executor 实现决定。</p>
      *
      * @param commands 命令链表
      */