From e78273af7ff93c71b54170744b464da1c0f3af9b Mon Sep 17 00:00:00 2001 From: TomXin <766781886@qq.com> Date: Sat, 27 Aug 2022 16:01:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96QrCodeUtil?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/hutool/extra/qrcode/QrCodeUtil.java | 31 +++++------- .../hutool/extra/qrcode/QrCodeUtilTest.java | 48 +++++++++---------- 2 files changed, 35 insertions(+), 44 deletions(-) diff --git a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java index 48820596a..4941f3618 100755 --- a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java @@ -5,11 +5,11 @@ import cn.hutool.core.img.Img; import cn.hutool.core.img.ImgUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IoUtil; -import cn.hutool.core.lang.ansi.Ansi8BitColor; +import cn.hutool.core.lang.ansi.AnsiColorWrapper; +import cn.hutool.core.lang.ansi.AnsiColors; import cn.hutool.core.lang.ansi.AnsiElement; import cn.hutool.core.lang.ansi.AnsiEncoder; import cn.hutool.core.util.CharsetUtil; -import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.URLUtil; import com.google.zxing.*; @@ -41,6 +41,7 @@ public class QrCodeUtil { public static final String QR_TYPE_SVG = "svg";// SVG矢量图格式 public static final String QR_TYPE_TXT = "txt";// Ascii Art字符画文本 + private static final AnsiColors ansiColors= new AnsiColors(AnsiColors.BitDepth.EIGHT); /** * 生成代 logo 图片的 Base64 编码格式的二维码，以 String 形式表示 @@ -631,8 +632,8 @@ public class QrCodeUtil { final int height = bitMatrix.getHeight(); - final AnsiElement foreground = qrConfig.foreColor == null ? null : Ansi8BitColor.foreground(rgbToAnsi8BitValue(qrConfig.foreColor)); - final AnsiElement background = qrConfig.backColor == null ? null : Ansi8BitColor.background(rgbToAnsi8BitValue(qrConfig.backColor)); + final AnsiElement foreground = qrConfig.foreColor == null ? null : rgbToAnsi8BitElement(qrConfig.foreColor, AnsiColorWrapper.ForeOrBack.FORE); + final AnsiElement background = qrConfig.backColor == null ? null : rgbToAnsi8BitElement(qrConfig.backColor, AnsiColorWrapper.ForeOrBack.BACK); StringBuilder builder = new StringBuilder(); for (int i = 0; i <= height; i += 2) { @@ -655,26 +656,16 @@ public class QrCodeUtil { return builder.toString(); } - /** - * rgb转Ansi8Bit值 +/* *//** + * rgb转AnsiElement * * @param rgb rgb颜色值 - * @return Ansi8bit颜色值 + * @param foreOrBack 前景or背景 + * @return AnsiElement * @since 5.8.6 */ - private static int rgbToAnsi8BitValue(int rgb) { - final int r = (rgb >> 16) & 0xff; - final int g = (rgb >> 8) & 0xff; - final int b = (rgb) & 0xff; - - final int l; - if (r == g && g == b) { - final int i = (int) (NumberUtil.div(NumberUtil.mul(r - 10.625, 23), (255 - 10.625), 0)); - l = i >= 0 ? 232 + i : 0; - } else { - l = 16 + (int) (36 * NumberUtil.div(NumberUtil.mul(r, 5), 255, 0)) + (int) (6.0 * (g / 256.0 * 6.0)) + (int) (b / 256.0 * 6.0); - } - return l; + private static AnsiElement rgbToAnsi8BitElement(int rgb,AnsiColorWrapper.ForeOrBack foreOrBack) { + return ansiColors.findClosest(new Color(rgb)).toAnsiElement(foreOrBack); } diff --git a/hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java index 8404ec39e..d4c0f264c 100755 --- a/hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java @@ -3,11 +3,11 @@ package cn.hutool.extra.qrcode; import cn.hutool.core.codec.Base64; import cn.hutool.core.img.ImgUtil; import cn.hutool.core.io.FileUtil; +import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.Console; import com.google.zxing.BarcodeFormat; import com.google.zxing.datamatrix.encoder.SymbolShapeHint; import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; -import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -29,7 +29,7 @@ public class QrCodeUtilTest { @Test public void generateTest() { final BufferedImage image = QrCodeUtil.generate("https://hutool.cn/", 300, 300); - Assert.assertNotNull(image); + Assert.notNull(image); } @Test @@ -72,7 +72,7 @@ public class QrCodeUtilTest { @Ignore public void decodeTest() { final String decode = QrCodeUtil.decode(FileUtil.file("d:/test/pic/qr.png")); - Console.log(decode); + //Console.log(decode); } @Test @@ -80,13 +80,13 @@ public class QrCodeUtilTest { public void decodeTest2() { // 条形码 final String decode = QrCodeUtil.decode(FileUtil.file("d:/test/90.png")); - Console.log(decode); + //Console.log(decode); } @Test public void generateAsBase64Test() { final String base64 = QrCodeUtil.generateAsBase64("https://hutool.cn/", new QrConfig(400, 400), "png"); - Assert.assertNotNull(base64); + Assert.notNull(base64); } @Test @@ -96,27 +96,27 @@ public class QrCodeUtilTest { new File("d:/test/qr.png")); final String encode = Base64.encode(bytes); final String base641 = QrCodeUtil.generateAsBase64("https://hutool.cn/", new QrConfig(400, 400), "png", encode); - Assert.assertNotNull(base641); + Assert.notNull(base641); } @Test public void generateAsBase64Test3() { final String base64 = QrCodeUtil.generateAsBase64("https://hutool.cn/", new QrConfig(400, 400), "svg"); - Assert.assertNotNull(base64); - System.out.println(base64); + Assert.notNull(base64); + //Console.log(base64); } @Test @Ignore public void decodeTest3() { final String decode = QrCodeUtil.decode(ImgUtil.read("d:/test/qr_a.png"), false, true); - Console.log(decode); + //Console.log(decode); } @Test public void pdf417Test() { final BufferedImage image = QrCodeUtil.generate("content111", BarcodeFormat.PDF_417, QrConfig.create()); - Assert.assertNotNull(image); + Assert.notNull(image); } @Test @@ -124,11 +124,11 @@ public class QrCodeUtilTest { final QrConfig qrConfig = QrConfig.create(); qrConfig.setShapeHint(SymbolShapeHint.FORCE_RECTANGLE); final BufferedImage image = QrCodeUtil.generate("content111", BarcodeFormat.DATA_MATRIX, qrConfig); - Assert.assertNotNull(image); + Assert.notNull(image); final QrConfig config = QrConfig.create(); config.setShapeHint(SymbolShapeHint.FORCE_SQUARE); final BufferedImage imageSquare = QrCodeUtil.generate("content111", BarcodeFormat.DATA_MATRIX, qrConfig); - Assert.assertNotNull(imageSquare); + Assert.notNull(imageSquare); } @Test @@ -142,7 +142,7 @@ public class QrCodeUtilTest { .setErrorCorrection(ErrorCorrectionLevel.M) .setMargin(1); final String svg = QrCodeUtil.generateAsSvg("https://hutool.cn/", qrConfig); - Assert.assertNotNull(svg); + Assert.notNull(svg); FileUtil.writeString(svg, FileUtil.touch("d:/test/hutool_qr.svg"),StandardCharsets.UTF_8); } @@ -154,8 +154,8 @@ public class QrCodeUtilTest { .setWidth(0) .setHeight(0).setMargin(1); final String asciiArt = QrCodeUtil.generateAsAsciiArt("https://hutool.cn/",qrConfig); - Assert.assertNotNull(asciiArt); - //Console.log(asciiArt); + Assert.notNull(asciiArt); + Console.log(asciiArt); } @Test @@ -166,7 +166,7 @@ public class QrCodeUtilTest { .setWidth(0) .setHeight(0).setMargin(1); final String asciiArt = QrCodeUtil.generateAsAsciiArt("https://hutool.cn/",qrConfig); - Assert.assertNotNull(asciiArt); + Assert.notNull(asciiArt); //Console.log(asciiArt); } @@ -180,8 +180,8 @@ public class QrCodeUtilTest { .setWidth(0) .setHeight(0).setMargin(1); final File qrFile = QrCodeUtil.generate("https://hutool.cn/", qrConfig, FileUtil.touch("d:/test/ascii_art_qr_code.txt")); - final BufferedReader reader = FileUtil.getReader(qrFile, StandardCharsets.UTF_8); - reader.lines().forEach(System.out::println); + //final BufferedReader reader = FileUtil.getReader(qrFile, StandardCharsets.UTF_8); + //reader.lines().forEach(Console::log); } @Test @@ -198,21 +198,21 @@ public class QrCodeUtilTest { }catch (final IOException e){ e.printStackTrace(); } - final BufferedReader reader = FileUtil.getReader(filepath, StandardCharsets.UTF_8); - reader.lines().forEach(System.out::println); + //final BufferedReader reader = FileUtil.getReader(filepath, StandardCharsets.UTF_8); + //reader.lines().forEach(Console::log); } @Test @Ignore - public void comparePngAndAsciiArtTest() { + public void comparePngAndSvgAndAsciiArtTest() { final QrConfig qrConfig = QrConfig.create() .setForeColor(null) .setBackColor(null) .setWidth(0) .setHeight(0).setMargin(1); - QrCodeUtil.generate("https://hutool.cn", qrConfig, FileUtil.touch("d:/test/compare/default.jpg")); - QrCodeUtil.generate("https://hutool.cn", qrConfig, FileUtil.touch("d:/test/compare/default.txt")); - QrCodeUtil.generate("https://hutool.cn", qrConfig, FileUtil.touch("d:/test/compare/default.png")); + QrCodeUtil.generate("https://hutool.cn", qrConfig, FileUtil.touch("d:/test/compare/config_null_color.jpg")); + QrCodeUtil.generate("https://hutool.cn", qrConfig, FileUtil.touch("d:/test/compare/config_null_color.txt")); + QrCodeUtil.generate("https://hutool.cn", qrConfig, FileUtil.touch("d:/test/compare/config_null_color.png")); } }