修复MAC打包图标缺失问题

Author: AnyListen

LICENSE

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.luooqi</groupId>
-    <artifactId>tools-ocr</artifactId>
+    <artifactId>treehole</artifactId>
     <version>1.0.0</version>
 
     <dependencies>
@@ -77,7 +77,9 @@
                     <jfxAppOutputDir>${project.build.directory}/app</jfxAppOutputDir>
                     <nativeOutputDir>${project.build.directory}/native</nativeOutputDir>
                     <appName>treehole</appName>
-                    <vendor>com.luooqi.ocr</vendor>
+                    <verbose>true</verbose>
+                    <vendor>com.luooqi</vendor>
+                    <needShortcut>true</needShortcut>
                 </configuration>
             </plugin>
         </plugins>

pom.xml

@@ -3,7 +3,6 @@
 
 import cn.hutool.core.swing.ScreenUtil;
 import cn.hutool.log.StaticLog;
-import com.apple.eawt.FullScreenUtilities;
 import com.luooqi.ocr.MainFm;
 import com.luooqi.ocr.model.CaptureInfo;
 import com.luooqi.ocr.utils.CommUtils;

src/main/deploy/package/macosx/treehole.icns

@@ -6,21 +6,20 @@
 import cn.hutool.http.HttpUtil;
 import cn.hutool.log.StaticLog;
 import com.luooqi.ocr.model.TextBlock;
-import com.sun.image.codec.jpeg.JPEGCodec;
-import com.sun.image.codec.jpeg.JPEGEncodeParam;
-import com.sun.image.codec.jpeg.JPEGImageEncoder;
 import javafx.scene.control.Button;
 import javafx.scene.control.Tooltip;
 
+import javax.imageio.IIOImage;
 import javax.imageio.ImageIO;
+import javax.imageio.ImageWriteParam;
+import javax.imageio.ImageWriter;
+import javax.imageio.stream.MemoryCacheImageOutputStream;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
+import java.util.*;
 
 public class CommUtils {
 
@@ -31,15 +30,20 @@ public class CommUtils {
     public static final String SPECIAL_CHARS = "[\\s`~!@#$%^&*()_\\-+=|{}':;,\\[\\].<>/?！￥…（）【】‘；：”“’。，、？]+";
 
     public static byte[] imageToBytes(BufferedImage img) {
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        MemoryCacheImageOutputStream outputStream = new MemoryCacheImageOutputStream(byteArrayOutputStream);
         try {
-            ImageIO.write(img, "jpeg", outputStream);
-            JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(outputStream);
-            JPEGEncodeParam jep = JPEGCodec.getDefaultJPEGEncodeParam(img);
-            jep.setQuality(IMAGE_QUALITY, true);
-            encoder.encode(img, jep);
-            byte[] result = outputStream.toByteArray();
-            System.out.println(result.length);
+            Iterator iter = ImageIO.getImageWritersByFormatName("jpeg");
+            ImageWriter writer = (ImageWriter)iter.next();
+            ImageWriteParam iwp = writer.getDefaultWriteParam();
+            iwp.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
+            iwp.setCompressionQuality(IMAGE_QUALITY);
+            writer.setOutput(outputStream);
+            IIOImage image = new IIOImage(img, null, null);
+            writer.write(null, image, iwp);
+            writer.dispose();
+            byte[] result = byteArrayOutputStream.toByteArray();
+            byteArrayOutputStream.close();
             outputStream.close();
             return result;
         } catch (IOException e) {