see 09/12 log

Author: Blankj

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

@@ -273,9 +273,14 @@ public static OutputStream string2OutputStream(String string, String charsetName
      */
     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();
+        ByteArrayOutputStream baos = null;
+        try {
+            baos = new ByteArrayOutputStream();
+            bitmap.compress(format, 100, baos);
+            return baos.toByteArray();
+        } finally {
+            FileUtils.closeIO(baos);
+        }
     }
 
     /**

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

@@ -4,9 +4,7 @@
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.Build;
-import android.os.Environment;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
@@ -33,36 +31,38 @@ private DeviceUtils() {
      * @return MAC地址
      */
     public static String getMacAddress(Context context) {
-        WifiManager wifi = (WifiManager) context
-                .getSystemService(Context.WIFI_SERVICE);
+        WifiManager wifi = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
         WifiInfo info = wifi.getConnectionInfo();
-        String macAddress = info.getMacAddress().replace(":", "");
-        return macAddress == null ? "" : macAddress;
+        if (info != null) {
+            String macAddress = info.getMacAddress();
+            if (macAddress != null) {
+                return macAddress.replace(":", "");
+            }
+        }
+        return null;
     }
 
     /**
      * 获取设备MAC地址
-     *
+     * <p/>
      * <p>需添加权限 {@code <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>}</p>
      *
      * @return MAC地址
      */
+
     public static String getMacAddress() {
         String macAddress = null;
-        LineNumberReader reader = null;
+        LineNumberReader lnr = null;
+        InputStreamReader isr = null;
         try {
             Process pp = Runtime.getRuntime().exec("cat /sys/class/net/wlan0/address");
-            InputStreamReader ir = new InputStreamReader(pp.getInputStream());
-            reader = new LineNumberReader(ir);
-            macAddress = reader.readLine().replace(":", "");
-        } catch (IOException ex) {
-            ex.printStackTrace();
+            isr = new InputStreamReader(pp.getInputStream());
+            lnr = new LineNumberReader(isr);
+            macAddress = lnr.readLine().replace(":", "");
+        } catch (IOException e) {
+            e.printStackTrace();
         } finally {
-            try {
-                if (reader != null) reader.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
+            FileUtils.closeIO(lnr, isr);
         }
         return macAddress == null ? "" : macAddress;
     }
@@ -90,4 +90,4 @@ public static String getModel() {
         }
         return model;
     }
-}
+}

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

@@ -63,9 +63,14 @@ private ImageUtils() {
      */
     public static byte[] bitmap2Bytes(Bitmap bitmap, CompressFormat format) {
         if (bitmap == null) return null;
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        bitmap.compress(format, 100, baos);
-        return baos.toByteArray();
+        ByteArrayOutputStream baos = null;
+        try {
+            baos = new ByteArrayOutputStream();
+            bitmap.compress(format, 100, baos);
+            return baos.toByteArray();
+        } finally {
+            FileUtils.closeIO(baos);
+        }
     }
 
     /**
@@ -699,15 +704,17 @@ public static Bitmap addText(Bitmap src, String text, int textSize, int color, f
      * @param unit     最大值单位
      * @return 压缩过的图片
      */
-    private Bitmap compress(Bitmap src, CompressFormat format, long topLimit, ConstUtils.MemoryUnit unit) {
+    private Bitmap compress(Bitmap src, CompressFormat format, long topLimit, ConstUtils.MemoryUnit unit, boolean
+            recycle) {
+        if (format == CompressFormat.PNG) return src;
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         src.compress(format, 100, os);
         long upperSize = FileUtils.size2Byte(topLimit, unit);
         while (os.toByteArray().length > upperSize) {
             os.reset();
             src.compress(format, 50, os);
         }
-        if (!src.isRecycled()) src.recycle();
+        if (recycle && !src.isRecycled()) src.recycle();
         return BitmapFactory.decodeStream(new ByteArrayInputStream(os.toByteArray()));
     }
 

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

@@ -2,7 +2,6 @@
 
 
 import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -18,7 +17,7 @@
 import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
 
-import static com.blankj.utilcode.utils.ConstUtils.*;
+import static com.blankj.utilcode.utils.ConstUtils.MB;
 
 /**
  * <pre>
@@ -37,62 +36,152 @@ private ZipUtils() {
     /**
      * 批量压缩文件
      *
-     * @param resFileList 要压缩的文件列表
-     * @param zipFile     生成的压缩文件
+     * @param resFiles    要压缩的文件列表
+     * @param zipFilePath 压缩文件路径
+     * @throws IOException IO错误时抛出
      */
-    public static void zipFiles(Collection<File> resFileList, File zipFile)
+    public static void zipFiles(Collection<File> resFiles, String zipFilePath)
             throws IOException {
-        zipFiles(resFileList, zipFile, null);
+        zipFiles(resFiles, zipFilePath, null);
     }
 
     /**
      * 批量压缩文件
      *
-     * @param resFileList 要压缩的文件列表
-     * @param zipFile     生成的压缩文件
+     * @param resFiles    要压缩的文件列表
+     * @param zipFilePath 压缩文件路径
      * @param comment     压缩文件的注释
+     * @throws IOException IO错误时抛出
      */
-    public static void zipFiles(Collection<File> resFileList, File zipFile, String comment) {
-        try {
-            for (File resFile : resFileList) {
-                zipFile(resFile, "", zipFile, comment);
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
+    public static void zipFiles(Collection<File> resFiles, String zipFilePath, String comment)
+            throws IOException {
+        zipFiles(resFiles, FileUtils.getFileByPath(zipFilePath), comment);
+    }
+
+    /**
+     * 批量压缩文件
+     *
+     * @param resFiles 要压缩的文件列表
+     * @param zipFile  生成的压缩文件
+     * @throws IOException IO错误时抛出
+     */
+    public static void zipFiles(Collection<File> resFiles, File zipFile)
+            throws IOException {
+        zipFiles(resFiles, zipFile, null);
+    }
+
+    /**
+     * 批量压缩文件
+     *
+     * @param resFiles 要压缩的文件列表
+     * @param zipFile  压缩文件
+     * @param comment  压缩文件的注释
+     * @throws IOException IO错误时抛出
+     */
+    public static void zipFiles(Collection<File> resFiles, File zipFile, String comment)
+            throws IOException {
+        if (resFiles == null || zipFile == null) return;
+        zipFiles(resFiles, new ZipOutputStream(new FileOutputStream(zipFile)), comment);
+    }
+
+    /**
+     * 批量压缩文件
+     *
+     * @param resFiles 要压缩的文件列表
+     * @param zos      压缩文件输出流
+     * @param comment  压缩文件的注释
+     * @throws IOException IO错误时抛出
+     */
+    public static void zipFiles(Collection<File> resFiles, ZipOutputStream zos, String comment)
+            throws IOException {
+        for (File resFile : resFiles) {
+            zipFile(resFile, "", zos, comment);
         }
     }
 
     /**
      * 压缩文件
      *
-     * @param resDirPath 需要压缩的文件
-     * @param rootPath   相对于压缩文件的路径
-     * @param zipFile    压缩的目的文件
-     * @throws IOException 当压缩过程出错时抛出
+     * @param resFilePath 需要压缩的文件路径
+     * @param zipFilePath 压缩文件路径
+     * @throws IOException IO错误时抛出
+     */
+    public static void zipFile(String resFilePath, String zipFilePath)
+            throws IOException {
+        zipFile(resFilePath, zipFilePath, null);
+    }
+
+    /**
+     * 压缩文件
+     *
+     * @param resFilePath 需要压缩的文件路径
+     * @param zipFilePath 压缩文件路径
+     * @param comment     压缩文件的注释
+     * @throws IOException IO错误时抛出
+     */
+    public static void zipFile(String resFilePath, String zipFilePath, String comment)
+            throws IOException {
+        zipFile(FileUtils.getFileByPath(resFilePath), FileUtils.getFileByPath(zipFilePath), comment);
+    }
+
+    /**
+     * 压缩文件
+     *
+     * @param resFile 需要压缩的文件
+     * @param zipFile 压缩文件
+     * @throws IOException IO错误时抛出
+     */
+    public static void zipFile(File resFile, File zipFile)
+            throws IOException {
+        zipFile(resFile, zipFile, null);
+    }
+
+    /**
+     * 压缩文件
+     *
+     * @param resFile 需要压缩的文件
+     * @param zipFile 压缩文件
+     * @param comment 压缩文件的注释
+     * @throws IOException IO错误时抛出
+     */
+    public static void zipFile(File resFile, File zipFile, String comment)
+            throws IOException {
+        if (resFile == null || zipFile == null) return;
+        zipFile(resFile, "", new ZipOutputStream(new FileOutputStream(zipFile)), comment);
+    }
+
+    /**
+     * 压缩文件
+     *
+     * @param resFile  需要压缩的文件
+     * @param rootPath 相对于压缩文件的路径
+     * @param zos      压缩文件输出流
+     * @param comment  压缩文件的注释
+     * @throws IOException IO错误时抛出
      */
-    public static void zipFile(File resDirPath, String rootPath, File zipFile, String comment)
+    public static void zipFile(File resFile, String rootPath, ZipOutputStream zos, String comment)
             throws IOException {
-        rootPath = rootPath + (rootPath.trim().length() == 0 ? "" : File.separator) + resDirPath.getName();
-        if (resDirPath.isDirectory()) {
-            File[] fileList = resDirPath.listFiles();
+        rootPath = rootPath + (StringUtils.isSpace(rootPath) ? "" : File.separator) + resFile.getName();
+        if (resFile.isDirectory()) {
+            File[] fileList = resFile.listFiles();
             for (File file : fileList) {
-                zipFile(file, rootPath, file, comment);
+                zipFile(file, rootPath, zos, comment);
             }
         } else {
             InputStream is = null;
-            ZipOutputStream zos = null;
             try {
-                is = new BufferedInputStream(new FileInputStream(resDirPath));
-                zos = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(zipFile)));
+                is = new BufferedInputStream(new FileInputStream(resFile));
                 zos.putNextEntry(new ZipEntry(rootPath));
                 byte buffer[] = new byte[MB];
                 int len;
                 while ((len = is.read(buffer)) != -1) {
                     zos.write(buffer, 0, len);
                 }
-                if (comment != null) zos.setComment(comment);
+                if (StringUtils.isEmpty(comment)) zos.setComment(comment);
             } finally {
-                FileUtils.closeIO(is, zos);
+                FileUtils.closeIO(is);
+                zos.flush();
+                zos.closeEntry();
             }
         }
     }
@@ -104,7 +193,7 @@ public static void zipFile(File resDirPath, String rootPath, File zipFile, Strin
      * @param destDirPath 解压缩的目标目录
      * @throws IOException IO错误时抛出
      */
-    public static void upZipFile(String zipFilePath, String destDirPath)
+    public static void unzipFile(String zipFilePath, String destDirPath)
             throws IOException {
         if (!FileUtils.createOrExistsDir(destDirPath)) return;
         ZipFile zf = new ZipFile(zipFilePath);
@@ -142,7 +231,7 @@ public static void upZipFile(String zipFilePath, String destDirPath)
      * @param targetFile  目标文件名
      * @throws IOException IO错误时抛出
      */
-    public static List<File> upZipSelectedFile(File zipFile, String destDirPath, String targetFile)
+    public static List<File> unzipSelectedFile(File zipFile, String destDirPath, String targetFile)
             throws IOException {
         if (!FileUtils.createOrExistsDir(destDirPath)) return null;
         List<File> fileList = new ArrayList<>();