From 4e53873d814172c4cdb6d540b4acd833df3fd513 Mon Sep 17 00:00:00 2001 From: TomXin <766781886@qq.com> Date: Sat, 27 Aug 2022 15:59:03 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E6=96=B0=E5=A2=9EAnsiColors=E3=80=81Ansi?= =?UTF-8?q?ColorWrapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/lang/ansi/AnsiColorWrapper.java | 83 +++++++ .../cn/hutool/core/lang/ansi/AnsiColors.java | 202 ++++++++++++++++++ .../core/lang/ansi/AnsiEncoderTest.java | 27 +++ 3 files changed, 312 insertions(+) create mode 100644 hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColorWrapper.java create mode 100644 hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColors.java diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColorWrapper.java b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColorWrapper.java new file mode 100644 index 000000000..dd197035e --- /dev/null +++ b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColorWrapper.java @@ -0,0 +1,83 @@ +package cn.hutool.core.lang.ansi; + +import cn.hutool.core.lang.Assert; + +import java.util.Objects; + +/** + * ANSI 颜色包装类 + * + * @author TomXin + * @since 5.8.6 + */ +public class AnsiColorWrapper { + + private final int code; + + private final AnsiColors.BitDepth bitDepth; + + /** + * 创建指定位深度的 {@link AnsiColorWrapper} 实例 + * @param code 颜色编码，位深度为4bit时，code取值范围[30~37]，[90~97]。位深度为8bit时，code取值范围[0~255] + * @param bitDepth 位深度 + */ + public AnsiColorWrapper(int code, AnsiColors.BitDepth bitDepth) { + if (bitDepth==AnsiColors.BitDepth.FOUR){ + Assert.isTrue((30<=code&&code<=37)||(90<=code&&code<=97),"The value of 4 bit color only supported [30~37],[90~97]."); + } + Assert.isTrue((0<=code&&code<=255),"The value of 8 bit color only supported [0~255]."); + this.code = code; + this.bitDepth = bitDepth; + } + + /** + * 转换为 {@link AnsiElement} 实例 + * + * @param foreOrBack 区分前景还是背景 + * @return {@link AnsiElement} 实例 + */ + public AnsiElement toAnsiElement(ForeOrBack foreOrBack){ + if (bitDepth== AnsiColors.BitDepth.FOUR){ + if (foreOrBack == ForeOrBack.FORE){ + return AnsiColor.valueOf(String.valueOf(code)); + } + return AnsiBackground.valueOf(String.valueOf(code + 10)); + } + if (foreOrBack == ForeOrBack.FORE){ + return Ansi8BitColor.foreground(code); + } + return Ansi8BitColor.background(code); + } + + /** + * 区分前景还是背景 + */ + public enum ForeOrBack{ + + /** + * 前景 + */ + FORE, + /** + * 背景 + */ + BACK, + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AnsiColorWrapper that = (AnsiColorWrapper) o; + return code == that.code && bitDepth == that.bitDepth; + } + + @Override + public int hashCode() { + return Objects.hash(code, bitDepth); + } +} diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColors.java b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColors.java new file mode 100644 index 000000000..f9a72ef56 --- /dev/null +++ b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColors.java @@ -0,0 +1,202 @@ +package cn.hutool.core.lang.ansi; + +import cn.hutool.core.lang.Assert; + +import java.awt.*; +import java.awt.color.ColorSpace; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.Map; + +/** + * + * 在 {@link Color AWT Colors} 的上下文中使用 {@link AnsiColor} 的实用程序 + *

来自Spring Boot

+ * + * @author Craig Burke,Ruben Dijkstra,Phillip Webb,Michael Simons,Tom Xin + * @since 5.8.6 + */ +public final class AnsiColors { + + private static final Map ANSI_COLOR_MAP; + + static { + Map colorMap = new LinkedHashMap<>(); + colorMap.put(new AnsiColorWrapper(30,BitDepth.FOUR), new LabColor(0x000000)); + colorMap.put(new AnsiColorWrapper(31,BitDepth.FOUR), new LabColor(0xAA0000)); + colorMap.put(new AnsiColorWrapper(32,BitDepth.FOUR), new LabColor(0x00AA00)); + colorMap.put(new AnsiColorWrapper(33,BitDepth.FOUR), new LabColor(0xAA5500)); + colorMap.put(new AnsiColorWrapper(34,BitDepth.FOUR), new LabColor(0x0000AA)); + colorMap.put(new AnsiColorWrapper(35,BitDepth.FOUR), new LabColor(0xAA00AA)); + colorMap.put(new AnsiColorWrapper(36,BitDepth.FOUR), new LabColor(0x00AAAA)); + colorMap.put(new AnsiColorWrapper(37,BitDepth.FOUR), new LabColor(0xAAAAAA)); + colorMap.put(new AnsiColorWrapper(90,BitDepth.FOUR), new LabColor(0x555555)); + colorMap.put(new AnsiColorWrapper(91,BitDepth.FOUR), new LabColor(0xFF5555)); + colorMap.put(new AnsiColorWrapper(92,BitDepth.FOUR), new LabColor(0x55FF00)); + colorMap.put(new AnsiColorWrapper(93,BitDepth.FOUR), new LabColor(0xFFFF55)); + colorMap.put(new AnsiColorWrapper(94,BitDepth.FOUR), new LabColor(0x5555FF)); + colorMap.put(new AnsiColorWrapper(95,BitDepth.FOUR), new LabColor(0xFF55FF)); + colorMap.put(new AnsiColorWrapper(96,BitDepth.FOUR), new LabColor(0x55FFFF)); + colorMap.put(new AnsiColorWrapper(97,BitDepth.FOUR), new LabColor(0xFFFFFF)); + ANSI_COLOR_MAP = Collections.unmodifiableMap(colorMap); + } + + private static final int[] ANSI_8BIT_COLOR_CODE_LOOKUP = new int[] { 0x000000, 0x800000, 0x008000, 0x808000, + 0x000080, 0x800080, 0x008080, 0xc0c0c0, 0x808080, 0xff0000, 0x00ff00, 0xffff00, 0x0000ff, 0xff00ff, + 0x00ffff, 0xffffff, 0x000000, 0x00005f, 0x000087, 0x0000af, 0x0000d7, 0x0000ff, 0x005f00, 0x005f5f, + 0x005f87, 0x005faf, 0x005fd7, 0x005fff, 0x008700, 0x00875f, 0x008787, 0x0087af, 0x0087d7, 0x0087ff, + 0x00af00, 0x00af5f, 0x00af87, 0x00afaf, 0x00afd7, 0x00afff, 0x00d700, 0x00d75f, 0x00d787, 0x00d7af, + 0x00d7d7, 0x00d7ff, 0x00ff00, 0x00ff5f, 0x00ff87, 0x00ffaf, 0x00ffd7, 0x00ffff, 0x5f0000, 0x5f005f, + 0x5f0087, 0x5f00af, 0x5f00d7, 0x5f00ff, 0x5f5f00, 0x5f5f5f, 0x5f5f87, 0x5f5faf, 0x5f5fd7, 0x5f5fff, + 0x5f8700, 0x5f875f, 0x5f8787, 0x5f87af, 0x5f87d7, 0x5f87ff, 0x5faf00, 0x5faf5f, 0x5faf87, 0x5fafaf, + 0x5fafd7, 0x5fafff, 0x5fd700, 0x5fd75f, 0x5fd787, 0x5fd7af, 0x5fd7d7, 0x5fd7ff, 0x5fff00, 0x5fff5f, + 0x5fff87, 0x5fffaf, 0x5fffd7, 0x5fffff, 0x870000, 0x87005f, 0x870087, 0x8700af, 0x8700d7, 0x8700ff, + 0x875f00, 0x875f5f, 0x875f87, 0x875faf, 0x875fd7, 0x875fff, 0x878700, 0x87875f, 0x878787, 0x8787af, + 0x8787d7, 0x8787ff, 0x87af00, 0x87af5f, 0x87af87, 0x87afaf, 0x87afd7, 0x87afff, 0x87d700, 0x87d75f, + 0x87d787, 0x87d7af, 0x87d7d7, 0x87d7ff, 0x87ff00, 0x87ff5f, 0x87ff87, 0x87ffaf, 0x87ffd7, 0x87ffff, + 0xaf0000, 0xaf005f, 0xaf0087, 0xaf00af, 0xaf00d7, 0xaf00ff, 0xaf5f00, 0xaf5f5f, 0xaf5f87, 0xaf5faf, + 0xaf5fd7, 0xaf5fff, 0xaf8700, 0xaf875f, 0xaf8787, 0xaf87af, 0xaf87d7, 0xaf87ff, 0xafaf00, 0xafaf5f, + 0xafaf87, 0xafafaf, 0xafafd7, 0xafafff, 0xafd700, 0xafd75f, 0xafd787, 0xafd7af, 0xafd7d7, 0xafd7ff, + 0xafff00, 0xafff5f, 0xafff87, 0xafffaf, 0xafffd7, 0xafffff, 0xd70000, 0xd7005f, 0xd70087, 0xd700af, + 0xd700d7, 0xd700ff, 0xd75f00, 0xd75f5f, 0xd75f87, 0xd75faf, 0xd75fd7, 0xd75fff, 0xd78700, 0xd7875f, + 0xd78787, 0xd787af, 0xd787d7, 0xd787ff, 0xd7af00, 0xd7af5f, 0xd7af87, 0xd7afaf, 0xd7afd7, 0xd7afff, + 0xd7d700, 0xd7d75f, 0xd7d787, 0xd7d7af, 0xd7d7d7, 0xd7d7ff, 0xd7ff00, 0xd7ff5f, 0xd7ff87, 0xd7ffaf, + 0xd7ffd7, 0xd7ffff, 0xff0000, 0xff005f, 0xff0087, 0xff00af, 0xff00d7, 0xff00ff, 0xff5f00, 0xff5f5f, + 0xff5f87, 0xff5faf, 0xff5fd7, 0xff5fff, 0xff8700, 0xff875f, 0xff8787, 0xff87af, 0xff87d7, 0xff87ff, + 0xffaf00, 0xffaf5f, 0xffaf87, 0xffafaf, 0xffafd7, 0xffafff, 0xffd700, 0xffd75f, 0xffd787, 0xffd7af, + 0xffd7d7, 0xffd7ff, 0xffff00, 0xffff5f, 0xffff87, 0xffffaf, 0xffffd7, 0xffffff, 0x080808, 0x121212, + 0x1c1c1c, 0x262626, 0x303030, 0x3a3a3a, 0x444444, 0x4e4e4e, 0x585858, 0x626262, 0x6c6c6c, 0x767676, + 0x808080, 0x8a8a8a, 0x949494, 0x9e9e9e, 0xa8a8a8, 0xb2b2b2, 0xbcbcbc, 0xc6c6c6, 0xd0d0d0, 0xdadada, + 0xe4e4e4, 0xeeeeee }; + + private final Map lookup; + + /** + * 创建具有指定位深度的新 {@link AnsiColors} 实例。 + * @param bitDepth 所需的位深度 + */ + public AnsiColors(BitDepth bitDepth) { + this.lookup = getLookup(bitDepth); + } + + private Map getLookup(BitDepth bitDepth) { + if (bitDepth == BitDepth.EIGHT) { + Map lookup = new LinkedHashMap<>(); + for (int i = 0; i < ANSI_8BIT_COLOR_CODE_LOOKUP.length; i++) { + lookup.put(new AnsiColorWrapper(i,BitDepth.EIGHT), new LabColor(ANSI_8BIT_COLOR_CODE_LOOKUP[i])); + } + return Collections.unmodifiableMap(lookup); + } + return ANSI_COLOR_MAP; + } + + /** + * 找到最接近给定 AWT {@link Color} 的 {@link AnsiColorWrapper ANSI 颜色包装} 实例。 + * @param color AWT 颜色 + * @return 最接近指定 ANSI 颜色的 {@link AnsiColorWrapper ANSI 颜色包装} 实例 + */ + public AnsiColorWrapper findClosest(Color color) { + return findClosest(new LabColor(color)); + } + + private AnsiColorWrapper findClosest(LabColor color) { + AnsiColorWrapper closest = null; + double closestDistance = Float.MAX_VALUE; + for (Map.Entry entry : this.lookup.entrySet()) { + double candidateDistance = color.getDistance(entry.getValue()); + if (closest == null || candidateDistance < closestDistance) { + closestDistance = candidateDistance; + closest = entry.getKey(); + } + } + return closest; + } + + /** + * 表示以 LAB 形式存储的颜色。 + */ + private static final class LabColor { + + private static final ColorSpace XYZ_COLOR_SPACE = ColorSpace.getInstance(ColorSpace.CS_CIEXYZ); + + private final double l; + + private final double a; + + private final double b; + + LabColor(Integer rgb) { + this((rgb != null) ? new Color(rgb) : null); + } + + LabColor(Color color) { + Assert.notNull(color, "Color must not be null"); + float[] lab = fromXyz(color.getColorComponents(XYZ_COLOR_SPACE, null)); + this.l = lab[0]; + this.a = lab[1]; + this.b = lab[2]; + } + + private float[] fromXyz(float[] xyz) { + return fromXyz(xyz[0], xyz[1], xyz[2]); + } + + private float[] fromXyz(float x, float y, float z) { + double l = (f(y) - 16.0) * 116.0; + double a = (f(x) - f(y)) * 500.0; + double b = (f(y) - f(z)) * 200.0; + return new float[] { (float) l, (float) a, (float) b }; + } + + private double f(double t) { + return (t > (216.0 / 24389.0)) ? Math.cbrt(t) : (1.0 / 3.0) * Math.pow(29.0 / 6.0, 2) * t + (4.0 / 29.0); + } + + // See https://en.wikipedia.org/wiki/Color_difference#CIE94 + double getDistance(LabColor other) { + double c1 = Math.sqrt(this.a * this.a + this.b * this.b); + double deltaC = c1 - Math.sqrt(other.a * other.a + other.b * other.b); + double deltaA = this.a - other.a; + double deltaB = this.b - other.b; + double deltaH = Math.sqrt(Math.max(0.0, deltaA * deltaA + deltaB * deltaB - deltaC * deltaC)); + return Math.sqrt(Math.max(0.0, Math.pow((this.l - other.l) / (1.0), 2) + + Math.pow(deltaC / (1 + 0.045 * c1), 2) + Math.pow(deltaH / (1 + 0.015 * c1), 2.0))); + } + + } + + /** + * 此类支持的位深度。 + */ + public enum BitDepth { + + /** + * 4位 (16色). + * @see AnsiColor + * @see AnsiBackground + */ + FOUR(4), + + /** + * 8位 (256色). + * @see Ansi8BitColor + */ + EIGHT(8); + + private final int bits; + + BitDepth(int bits) { + this.bits = bits; + } + + public static BitDepth of(int bits) { + for (BitDepth candidate : values()) { + if (candidate.bits == bits) { + return candidate; + } + } + throw new IllegalArgumentException("Unsupported ANSI bit depth '" + bits + "'"); + } + + } +} diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/ansi/AnsiEncoderTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/ansi/AnsiEncoderTest.java index 710c5c0f0..d5c9ef17e 100755 --- a/hutool-core/src/test/java/cn/hutool/core/lang/ansi/AnsiEncoderTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/ansi/AnsiEncoderTest.java @@ -1,8 +1,12 @@ package cn.hutool.core.lang.ansi; +import cn.hutool.core.lang.Console; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; +import java.awt.*; + public class AnsiEncoderTest { @Test @@ -10,4 +14,27 @@ public class AnsiEncoderTest { final String encode = AnsiEncoder.encode(AnsiColor.GREEN, "Hutool test"); Assert.assertEquals("\u001B[32mHutool test\u001B[0;39m", encode); } + + @Test + @Ignore + public void colorfulEncodeTest(){ + String text = "Hutool▀████▀"; + final AnsiColors ansiColors = new AnsiColors(AnsiColors.BitDepth.EIGHT); + Color[] colorArray = new Color[]{ + Color.BLACK, Color.BLUE, + Color.CYAN, Color.DARK_GRAY, + Color.GRAY, Color.GREEN, + Color.LIGHT_GRAY, Color.MAGENTA, + Color.ORANGE, Color.PINK, + Color.RED, Color.WHITE, + Color.YELLOW + }; + for (Color foreColor : colorArray) { + AnsiElement foreElement = ansiColors.findClosest(foreColor).toAnsiElement(AnsiColorWrapper.ForeOrBack.FORE); + Color backColor = new Color(255 - foreColor.getRed(), 255 - foreColor.getGreen(), 255 - foreColor.getBlue()); + AnsiElement backElement = ansiColors.findClosest(backColor).toAnsiElement(AnsiColorWrapper.ForeOrBack.BACK); + String encode = AnsiEncoder.encode(foreElement, backElement, text); + //Console.print( i%2==1?encode+"\n":encode); + } + } } 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 02/15] =?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")); } } From a90664b3d77ae089321fd45d9fdd254993fe605e Mon Sep 17 00:00:00 2001 From: TomXin <766781886@qq.com> Date: Sat, 27 Aug 2022 17:27:09 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0AnsiEncoderTest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/lang/ansi/AnsiColorWrapper.java | 15 ++++++++-- .../core/lang/ansi/AnsiEncoderTest.java | 28 +++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColorWrapper.java b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColorWrapper.java index dd197035e..b926c29ff 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColorWrapper.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColorWrapper.java @@ -1,6 +1,7 @@ package cn.hutool.core.lang.ansi; import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.StrUtil; import java.util.Objects; @@ -39,9 +40,19 @@ public class AnsiColorWrapper { public AnsiElement toAnsiElement(ForeOrBack foreOrBack){ if (bitDepth== AnsiColors.BitDepth.FOUR){ if (foreOrBack == ForeOrBack.FORE){ - return AnsiColor.valueOf(String.valueOf(code)); + for (AnsiColor item : AnsiColor.values()) { + if (StrUtil.equals(item.toString(), StrUtil.toString(code))) { + return item; + } + } + throw new IllegalArgumentException(StrUtil.format("No matched AnsiColor instance,code={}",code)); } - return AnsiBackground.valueOf(String.valueOf(code + 10)); + for (AnsiBackground item : AnsiBackground.values()) { + if (StrUtil.equals(item.toString(), StrUtil.toString(code+10))) { + return item; + } + } + throw new IllegalArgumentException(StrUtil.format("No matched Background instance,code=",code)); } if (foreOrBack == ForeOrBack.FORE){ return Ansi8BitColor.foreground(code); diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/ansi/AnsiEncoderTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/ansi/AnsiEncoderTest.java index d5c9ef17e..91f6b7aeb 100755 --- a/hutool-core/src/test/java/cn/hutool/core/lang/ansi/AnsiEncoderTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/ansi/AnsiEncoderTest.java @@ -1,6 +1,7 @@ package cn.hutool.core.lang.ansi; import cn.hutool.core.lang.Console; +import cn.hutool.core.util.StrUtil; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -37,4 +38,31 @@ public class AnsiEncoderTest { //Console.print( i%2==1?encode+"\n":encode); } } + + @Test + public void colorMappingTest(){ + String text4 = "RGB:({},{},{})--4bit "; + String text8 = "RGB:({},{},{})--8bit "; + final AnsiColors ansiColors4Bit = new AnsiColors(AnsiColors.BitDepth.FOUR); + final AnsiColors ansiColors8Bit = new AnsiColors(AnsiColors.BitDepth.EIGHT); + int count = 0; + int from = 100000; + int until = 120000; + for (int r = 0; r < 256; r++) { + if (count>until)break; + for (int g = 0; g < 256; g++) { + if (count>until)break; + for (int b = 0; b < 256; b++) { + count++; + if (countuntil)break; + AnsiElement backElement4bit = ansiColors4Bit.findClosest(new Color(r,g,b)).toAnsiElement(AnsiColorWrapper.ForeOrBack.BACK); + AnsiElement backElement8bit = ansiColors8Bit.findClosest(new Color(r,g,b)).toAnsiElement(AnsiColorWrapper.ForeOrBack.BACK); + String encode4 = AnsiEncoder.encode( backElement4bit,text4); + String encode8 = AnsiEncoder.encode( backElement8bit,text8); + //Console.log(StrUtil.format(encode4,r,g,b)+StrUtil.format(encode8,r,g,b)); + } + } + } + } } From 03d9efd61e9239df8da342fa7da5be8cc7bc1f06 Mon Sep 17 00:00:00 2001 From: TomXin <766781886@qq.com> Date: Sat, 27 Aug 2022 17:57:33 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E8=A1=A5=E5=85=85QrConfig=E7=9A=84?= =?UTF-8?q?=E5=AE=BD=E9=AB=98=E5=B1=9E=E6=80=A7=E7=9A=84=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/hutool/extra/qrcode/QrConfig.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java b/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java index f4ea8f12a..b461eccf4 100755 --- a/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java @@ -25,9 +25,19 @@ public class QrConfig { private static final int BLACK = 0xFF000000; private static final int WHITE = 0xFFFFFFFF; - /** 宽 */ + + /** + * 宽度（单位：像素或▄） + *
当二维码类型为一般图片或者SVG时，单位是像素
+ *
当二维码类型Ascii Art字符画时，单位是字符▄或▀的大小
+ */ protected int width; - /** 长 */ + + /** + * 高度（单位：像素或▄） + *
当二维码类型为一般图片或者SVG时，单位是像素
+ *
当二维码类型Ascii Art字符画时，单位是字符▄或▀的大小
+ */ protected int height; /** 前景色（二维码颜色） */ protected Integer foreColor = BLACK; From 7c3ea87b0b471d5cb0fea3cda1b0d794546d8ea2 Mon Sep 17 00:00:00 2001 From: TomXin <766781886@qq.com> Date: Sat, 27 Aug 2022 22:04:03 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E3=80=81=E8=A1=A5?= =?UTF-8?q?=E5=85=85QrCodeUtil=E7=9A=84=E7=9A=84=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E7=94=9F=E6=88=90SVG=E7=9A=84?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/hutool/extra/qrcode/QrCodeUtil.java | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 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 4941f3618..59425e8a5 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 @@ -150,7 +150,7 @@ public class QrCodeUtil { * 生成ASCII Art字符画形式的二维码 * * @param content 内容 - * @param qrConfig 二维码配置，仅长、宽、边距配置有效 + * @param qrConfig 二维码配置，仅宽度、高度、边距配置有效 * @return ASCII Art字符画形式的二维码 * @since 5.8.6 */ @@ -161,8 +161,8 @@ public class QrCodeUtil { /** * @param content 内容 - * @param width 宽 - * @param height 长 + * @param width 宽度（单位：字符▄的大小） + * @param height 高度（单位：字符▄的大小） * @return ASCII Art字符画形式的二维码 * @since 5.8.6 */ @@ -176,8 +176,8 @@ public class QrCodeUtil { * 生成PNG格式的二维码图片，以byte[]形式表示 * * @param content 内容 - * @param width 宽度 - * @param height 高度 + * @param width 宽度（单位：像素） + * @param height 高度（单位：像素） * @return 图片的byte[] * @since 4.0.10 */ @@ -205,8 +205,8 @@ public class QrCodeUtil { * 生成二维码到文件，二维码图片格式取决于文件的扩展名 * * @param content 文本内容 - * @param width 宽度 - * @param height 高度 + * @param width 宽度（单位：类型为一般图片或SVG时，单位是像素，类型为 Ascii Art 字符画时，单位是字符▄或▀的大小） + * @param height 高度（单位：类型为一般图片或SVG时，单位是像素，类型为 Ascii Art 字符画时，单位是字符▄或▀的大小） * @param targetFile 目标文件，扩展名决定输出格式 * @return 目标文件 */ @@ -262,8 +262,8 @@ public class QrCodeUtil { * 生成二维码到输出流 * * @param content 文本内容 - * @param width 宽度 - * @param height 高度 + * @param width 宽度（单位：类型为一般图片或SVG时，单位是像素，类型为 Ascii Art 字符画时，单位是字符▄或▀的大小） + * @param height 高度（单位：类型为一般图片或SVG时，单位是像素，类型为 Ascii Art 字符画时，单位是字符▄或▀的大小） * @param targetType 类型（图片扩展名），见{@link #QR_TYPE_SVG}、 {@link #QR_TYPE_TXT}、{@link ImgUtil} * @param out 目标流 */ @@ -314,8 +314,8 @@ public class QrCodeUtil { * 生成二维码图片 * * @param content 文本内容 - * @param width 宽度 - * @param height 高度 + * @param width 宽度（单位：类型为一般图片或SVG时，单位是像素，类型为 Ascii Art 字符画时，单位是字符▄或▀的大小） + * @param height 高度（单位：类型为一般图片或SVG时，单位是像素，类型为 Ascii Art 字符画时，单位是字符▄或▀的大小） * @return 二维码图片（黑白） */ public static BufferedImage generate(String content, int width, int height) { @@ -327,8 +327,8 @@ public class QrCodeUtil { * * @param content 文本内容 * @param format 格式，可选二维码或者条形码 - * @param width 宽度 - * @param height 高度 + * @param width 宽度（单位：像素） + * @param height 高度（单位：像素） * @return 二维码图片（黑白） */ public static BufferedImage generate(String content, BarcodeFormat format, int width, int height) { @@ -339,7 +339,7 @@ public class QrCodeUtil { * 生成二维码图片 * * @param content 文本内容 - * @param config 二维码配置，包括长、宽、边距、颜色等 + * @param config 二维码配置，包括宽度、高度、边距、颜色等 * @return 二维码图片（黑白） * @since 4.1.2 */ @@ -353,7 +353,7 @@ public class QrCodeUtil { * * @param content 文本内容 * @param format 格式，可选二维码、条形码等 - * @param config 二维码配置，包括长、宽、边距、颜色等 + * @param config 二维码配置，包括宽度、高度、边距、颜色等 * @return 二维码图片（黑白） * @since 4.1.14 */ @@ -391,8 +391,8 @@ public class QrCodeUtil { * 将文本内容编码为二维码 * * @param content 文本内容 - * @param width 宽度 - * @param height 高度 + * @param width 宽度（单位：类型为一般图片或SVG时，单位是像素，类型为 Ascii Art 字符画时，单位是字符▄或▀的大小） + * @param height 高度（单位：类型为一般图片或SVG时，单位是像素，类型为 Ascii Art 字符画时，单位是字符▄或▀的大小） * @return {@link BitMatrix} */ public static BitMatrix encode(String content, int width, int height) { @@ -416,8 +416,8 @@ public class QrCodeUtil { * * @param content 文本内容 * @param format 格式枚举 - * @param width 宽度 - * @param height 高度 + * @param width 宽度（单位：类型为一般图片或SVG时，单位是像素，类型为 Ascii Art 字符画时，单位是字符▄或▀的大小） + * @param height 高度（单位：类型为一般图片或SVG时，单位是像素，类型为 Ascii Art 字符画时，单位是字符▄或▀的大小） * @return {@link BitMatrix} */ public static BitMatrix encode(String content, BarcodeFormat format, int width, int height) { @@ -429,7 +429,7 @@ public class QrCodeUtil { * * @param content 文本内容 * @param format 格式枚举 - * @param config 二维码配置，包括长、宽、边距、颜色等 + * @param config 二维码配置，包括宽度、高度、边距、颜色等 * @return {@link BitMatrix} * @since 4.1.2 */ @@ -550,7 +550,7 @@ public class QrCodeUtil { * BitMatrix转SVG(字符串) * * @param matrix BitMatrix - * @param qrConfig 二维码配置，包括长、宽、边距、颜色等 + * @param qrConfig 二维码配置，包括宽度、高度、边距、颜色等 * @return SVG矢量图（字符串） * @since 5.8.6 */ @@ -576,7 +576,7 @@ public class QrCodeUtil { for (int y = 0; y < qrHeight; y++) { for (int x = 0; x < qrWidth; x++) { if (matrix.get(x, y)) { - sb.append(" M" + x + "," + y + "h1v" + moduleHeight + "h-1z"); + sb.append(" M").append(x).append(",").append(y).append("h1v").append(moduleHeight).append("h-1z"); } } } @@ -604,17 +604,17 @@ public class QrCodeUtil { Color fore = new Color(foreColor, true); StringBuilder result = StrUtil.builder(); - result.append("\n"); - result.append(" \n"); + result.append(" \n"); if (StrUtil.isNotBlank(logoBase64)) { - result.append("\n"); + result.append("\n"); } result.append(""); return result.toString(); @@ -623,7 +623,7 @@ public class QrCodeUtil { /** * BitMatrix转ASCII Art字符画形式的二维码 * - * @param bitMatrix + * @param bitMatrix BitMatrix * @return ASCII Art字符画形式的二维码 * @since 5.8.6 */ From 1ebdea3e0e81b2f229ddae5dc0232ccd7f1c4418 Mon Sep 17 00:00:00 2001 From: TomXin <766781886@qq.com> Date: Sat, 27 Aug 2022 22:08:28 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E3=80=81=E8=A1=A5?= =?UTF-8?q?=E5=85=85QrCodeUtil=E7=9A=84=E7=9A=84=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/hutool/extra/qrcode/QrCodeUtil.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 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 59425e8a5..68b3e98e8 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 @@ -47,7 +47,7 @@ public class QrCodeUtil { * 生成代 logo 图片的 Base64 编码格式的二维码，以 String 形式表示 * * @param content 内容 - * @param qrConfig 二维码配置，包括长、宽、边距、颜色等 + * @param qrConfig 二维码配置，包括宽度、高度、边距、颜色等 * @param targetType 类型（图片扩展名），见{@link #QR_TYPE_SVG}、 {@link #QR_TYPE_TXT}、{@link ImgUtil} * @param logoBase64 logo 图片的 base64 编码 * @return 图片 Base64 编码字符串 @@ -60,7 +60,7 @@ public class QrCodeUtil { * 生成代 logo 图片的 Base64 编码格式的二维码，以 String 形式表示 * * @param content 内容 - * @param qrConfig 二维码配置，包括长、宽、边距、颜色等 + * @param qrConfig 二维码配置，包括宽度、高度、边距、颜色等 * @param targetType 类型（图片扩展名），见{@link #QR_TYPE_SVG}、 {@link #QR_TYPE_TXT}、{@link ImgUtil} * @param logo logo 图片的byte[] * @return 图片 Base64 编码字符串 @@ -73,7 +73,7 @@ public class QrCodeUtil { * 生成代 logo 图片的 Base64 编码格式的二维码，以 String 形式表示 * * @param content 内容 - * @param qrConfig 二维码配置，包括长、宽、边距、颜色等 + * @param qrConfig 二维码配置，包括宽度、高度、边距、颜色等 * @param targetType 类型（图片扩展名），见{@link #QR_TYPE_SVG}、 {@link #QR_TYPE_TXT}、{@link ImgUtil} * @param logo logo 图片的byte[] * @return 图片 Base64 编码字符串 @@ -91,7 +91,7 @@ public class QrCodeUtil { *

* * @param content 内容 - * @param qrConfig 二维码配置，包括长、宽、边距、颜色等 + * @param qrConfig 二维码配置，包括宽度、高度、边距、颜色等 * @param targetType 类型（图片扩展名），见{@link #QR_TYPE_SVG}、 {@link #QR_TYPE_TXT}、{@link ImgUtil} * @return 图片 Base64 编码字符串 */ @@ -126,7 +126,7 @@ public class QrCodeUtil { /** * @param content 内容 - * @param qrConfig 二维码配置，包括长、宽、边距、颜色等 + * @param qrConfig 二维码配置，包括宽度、高度、边距、颜色等 * @return SVG矢量图（字符串） * @since 5.8.6 */ @@ -191,7 +191,7 @@ public class QrCodeUtil { * 生成PNG格式的二维码图片，以byte[]形式表示 * * @param content 内容 - * @param config 二维码配置，包括长、宽、边距、颜色等 + * @param config 二维码配置，包括宽度、高度、边距、颜色等 * @return 图片的byte[] * @since 4.1.2 */ @@ -234,7 +234,7 @@ public class QrCodeUtil { * 生成二维码到文件，二维码图片格式取决于文件的扩展名 * * @param content 文本内容 - * @param config 二维码配置，包括长、宽、边距、颜色等 + * @param config 二维码配置，包括宽度、高度、边距、颜色等 * @param targetFile 目标文件，扩展名决定输出格式 * @return 目标文件 * @since 4.1.2 @@ -288,7 +288,7 @@ public class QrCodeUtil { * 生成二维码到输出流 * * @param content 文本内容 - * @param config 二维码配置，包括长、宽、边距、颜色等 + * @param config 二维码配置，包括宽度、高度、边距、颜色等 * @param targetType 类型（图片扩展名），见{@link #QR_TYPE_SVG}、 {@link #QR_TYPE_TXT}、{@link ImgUtil} * @param out 目标流 * @since 4.1.2 @@ -403,7 +403,7 @@ public class QrCodeUtil { * 将文本内容编码为二维码 * * @param content 文本内容 - * @param config 二维码配置，包括长、宽、边距、颜色等 + * @param config 二维码配置，包括宽度、高度、边距、颜色等 * @return {@link BitMatrix} * @since 4.1.2 */ @@ -455,11 +455,11 @@ public class QrCodeUtil { /** * 解码二维码或条形码图片为文本 * - * @param qrCodeInputstream 二维码输入流 + * @param qrCodeInputStream 二维码输入流 * @return 解码文本 */ - public static String decode(InputStream qrCodeInputstream) { - return decode(ImgUtil.read(qrCodeInputstream)); + public static String decode(InputStream qrCodeInputStream) { + return decode(ImgUtil.read(qrCodeInputStream)); } /** From cb5c5ba74f62c5338a91662fdba3bfe8af952ae7 Mon Sep 17 00:00:00 2001 From: TomXin <766781886@qq.com> Date: Sat, 27 Aug 2022 22:27:45 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=9F=E6=88=90SVG?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/hutool/extra/qrcode/QrCodeUtil.java | 11 +++++++---- .../java/cn/hutool/extra/qrcode/QrCodeUtilTest.java | 7 ++++--- 2 files changed, 11 insertions(+), 7 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 68b3e98e8..0ccc098b4 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 @@ -568,7 +568,7 @@ public class QrCodeUtil { * @return SVG矢量图（字符串） * @since 5.8.6 */ - public static String toSVG(BitMatrix matrix, int foreColor, Integer backColor, Image logoImg, int ratio) { + public static String toSVG(BitMatrix matrix, Integer foreColor, Integer backColor, Image logoImg, int ratio) { StringBuilder sb = new StringBuilder(); int qrWidth = matrix.getWidth(); int qrHeight = matrix.getHeight(); @@ -601,8 +601,6 @@ public class QrCodeUtil { } - Color fore = new Color(foreColor, true); - StringBuilder result = StrUtil.builder(); result.append("\n"); - result.append(" \n"); + result.append(" \n"); if (StrUtil.isNotBlank(logoBase64)) { result.append("\n"); } 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 d4c0f264c..52fbe6ba9 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 @@ -207,12 +207,13 @@ public class QrCodeUtilTest { public void comparePngAndSvgAndAsciiArtTest() { final QrConfig qrConfig = QrConfig.create() .setForeColor(null) - .setBackColor(null) - .setWidth(0) - .setHeight(0).setMargin(1); + .setBackColor(Color.WHITE) + .setWidth(200) + .setHeight(200).setMargin(1); 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")); + QrCodeUtil.generate("https://hutool.cn", qrConfig, FileUtil.touch("d:/test/compare/config_null_color.svg")); } } From e11ae8fec50dfb26d3d01b844dbee5b011650607 Mon Sep 17 00:00:00 2001 From: TomXin <766781886@qq.com> Date: Sat, 27 Aug 2022 22:44:05 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E4=BC=98=E5=8C=96AnsiColors?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/hutool/core/lang/ansi/AnsiColors.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColors.java b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColors.java index f9a72ef56..83516444c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColors.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColors.java @@ -2,7 +2,7 @@ package cn.hutool.core.lang.ansi; import cn.hutool.core.lang.Assert; -import java.awt.*; +import java.awt.Color; import java.awt.color.ColorSpace; import java.util.Collections; import java.util.LinkedHashMap; From 807f693749de0d2d475c3ae6689a37ef55a41586 Mon Sep 17 00:00:00 2001 From: TomXin <766781886@qq.com> Date: Sat, 27 Aug 2022 22:46:48 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E4=BC=98=E5=8C=96QrCodeUtil?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 0ccc098b4..65cf42596 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 @@ -17,7 +17,9 @@ import com.google.zxing.common.BitMatrix; import com.google.zxing.common.GlobalHistogramBinarizer; import com.google.zxing.common.HybridBinarizer; -import java.awt.*; +import java.awt.Color; +import java.awt.Image; +import java.awt.Rectangle; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; import java.io.File; From 25be5141b594ffeaf4c32af9be1725aeb237a312 Mon Sep 17 00:00:00 2001 From: TomXin <766781886@qq.com> Date: Sun, 28 Aug 2022 17:19:38 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/hutool/core/lang/ansi/AnsiColorWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColorWrapper.java b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColorWrapper.java index b926c29ff..a9b8f19a3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColorWrapper.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColorWrapper.java @@ -52,7 +52,7 @@ public class AnsiColorWrapper { return item; } } - throw new IllegalArgumentException(StrUtil.format("No matched Background instance,code=",code)); + throw new IllegalArgumentException(StrUtil.format("No matched Background instance,code={}",code)); } if (foreOrBack == ForeOrBack.FORE){ return Ansi8BitColor.foreground(code); From d9506196debe88021c1e3a5d446b8091b8ce7fd1 Mon Sep 17 00:00:00 2001 From: TomXin <766781886@qq.com> Date: Sun, 28 Aug 2022 19:38:40 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E4=BC=98=E5=8C=96AnsiColors?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/hutool/core/lang/ansi/AnsiColors.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColors.java b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColors.java index 83516444c..70208cca0 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColors.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColors.java @@ -21,7 +21,7 @@ public final class AnsiColors { private static final Map ANSI_COLOR_MAP; static { - Map colorMap = new LinkedHashMap<>(); + Map colorMap = new LinkedHashMap<>(16); colorMap.put(new AnsiColorWrapper(30,BitDepth.FOUR), new LabColor(0x000000)); colorMap.put(new AnsiColorWrapper(31,BitDepth.FOUR), new LabColor(0xAA0000)); colorMap.put(new AnsiColorWrapper(32,BitDepth.FOUR), new LabColor(0x00AA00)); @@ -81,7 +81,7 @@ public final class AnsiColors { private Map getLookup(BitDepth bitDepth) { if (bitDepth == BitDepth.EIGHT) { - Map lookup = new LinkedHashMap<>(); + Map lookup = new LinkedHashMap<>(256); for (int i = 0; i < ANSI_8BIT_COLOR_CODE_LOOKUP.length; i++) { lookup.put(new AnsiColorWrapper(i,BitDepth.EIGHT), new LabColor(ANSI_8BIT_COLOR_CODE_LOOKUP[i])); } From 146abd3e2615fb4686c15537cb209c391b253cee Mon Sep 17 00:00:00 2001 From: TomXin <766781886@qq.com> Date: Sun, 28 Aug 2022 20:30:57 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E4=BC=98=E5=8C=96AnsiColorWrapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hutool/core/lang/ansi/AnsiColorWrapper.java | 15 --------------- .../cn/hutool/core/lang/ansi/ForeOrBack.java | 16 ++++++++++++++++ .../hutool/core/lang/ansi/AnsiEncoderTest.java | 11 ++++++----- .../java/cn/hutool/extra/qrcode/QrCodeUtil.java | 11 ++++------- 4 files changed, 26 insertions(+), 27 deletions(-) create mode 100644 hutool-core/src/main/java/cn/hutool/core/lang/ansi/ForeOrBack.java diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColorWrapper.java b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColorWrapper.java index a9b8f19a3..bf010c492 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColorWrapper.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColorWrapper.java @@ -60,21 +60,6 @@ public class AnsiColorWrapper { return Ansi8BitColor.background(code); } - /** - * 区分前景还是背景 - */ - public enum ForeOrBack{ - - /** - * 前景 - */ - FORE, - /** - * 背景 - */ - BACK, - } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/ForeOrBack.java b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/ForeOrBack.java new file mode 100644 index 000000000..518782bbf --- /dev/null +++ b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/ForeOrBack.java @@ -0,0 +1,16 @@ +package cn.hutool.core.lang.ansi; + +/** + * 区分前景还是背景 + */ +public enum ForeOrBack{ + + /** + * 前景 + */ + FORE, + /** + * 背景 + */ + BACK, +} diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/ansi/AnsiEncoderTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/ansi/AnsiEncoderTest.java index 91f6b7aeb..b2eaa50cf 100755 --- a/hutool-core/src/test/java/cn/hutool/core/lang/ansi/AnsiEncoderTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/lang/ansi/AnsiEncoderTest.java @@ -30,10 +30,11 @@ public class AnsiEncoderTest { Color.RED, Color.WHITE, Color.YELLOW }; - for (Color foreColor : colorArray) { - AnsiElement foreElement = ansiColors.findClosest(foreColor).toAnsiElement(AnsiColorWrapper.ForeOrBack.FORE); + for (int i = 0; i < colorArray.length; i++) { + Color foreColor = colorArray[i]; + AnsiElement foreElement = ansiColors.findClosest(foreColor).toAnsiElement(ForeOrBack.FORE); Color backColor = new Color(255 - foreColor.getRed(), 255 - foreColor.getGreen(), 255 - foreColor.getBlue()); - AnsiElement backElement = ansiColors.findClosest(backColor).toAnsiElement(AnsiColorWrapper.ForeOrBack.BACK); + AnsiElement backElement = ansiColors.findClosest(backColor).toAnsiElement(ForeOrBack.BACK); String encode = AnsiEncoder.encode(foreElement, backElement, text); //Console.print( i%2==1?encode+"\n":encode); } @@ -56,8 +57,8 @@ public class AnsiEncoderTest { count++; if (countuntil)break; - AnsiElement backElement4bit = ansiColors4Bit.findClosest(new Color(r,g,b)).toAnsiElement(AnsiColorWrapper.ForeOrBack.BACK); - AnsiElement backElement8bit = ansiColors8Bit.findClosest(new Color(r,g,b)).toAnsiElement(AnsiColorWrapper.ForeOrBack.BACK); + AnsiElement backElement4bit = ansiColors4Bit.findClosest(new Color(r,g,b)).toAnsiElement(ForeOrBack.BACK); + AnsiElement backElement8bit = ansiColors8Bit.findClosest(new Color(r,g,b)).toAnsiElement(ForeOrBack.BACK); String encode4 = AnsiEncoder.encode( backElement4bit,text4); String encode8 = AnsiEncoder.encode( backElement8bit,text8); //Console.log(StrUtil.format(encode4,r,g,b)+StrUtil.format(encode8,r,g,b)); 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 65cf42596..2a4d3171a 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,10 +5,7 @@ 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.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.lang.ansi.*; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.URLUtil; @@ -637,8 +634,8 @@ public class QrCodeUtil { final int height = bitMatrix.getHeight(); - 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); + final AnsiElement foreground = qrConfig.foreColor == null ? null : rgbToAnsi8BitElement(qrConfig.foreColor, ForeOrBack.FORE); + final AnsiElement background = qrConfig.backColor == null ? null : rgbToAnsi8BitElement(qrConfig.backColor, ForeOrBack.BACK); StringBuilder builder = new StringBuilder(); for (int i = 0; i <= height; i += 2) { @@ -669,7 +666,7 @@ public class QrCodeUtil { * @return AnsiElement * @since 5.8.6 */ - private static AnsiElement rgbToAnsi8BitElement(int rgb,AnsiColorWrapper.ForeOrBack foreOrBack) { + private static AnsiElement rgbToAnsi8BitElement(int rgb,ForeOrBack foreOrBack) { return ansiColors.findClosest(new Color(rgb)).toAnsiElement(foreOrBack); } From ea6fc4e9bb0aaa5d2436c60f599f30abc6440ef9 Mon Sep 17 00:00:00 2001 From: TomXin <766781886@qq.com> Date: Mon, 29 Aug 2022 07:05:10 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E4=BC=98=E5=8C=96AnsiColorWrapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hutool/core/lang/ansi/AnsiColorWrapper.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColorWrapper.java b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColorWrapper.java index bf010c492..f7bdd0b53 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColorWrapper.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColorWrapper.java @@ -41,23 +41,23 @@ public class AnsiColorWrapper { if (bitDepth== AnsiColors.BitDepth.FOUR){ if (foreOrBack == ForeOrBack.FORE){ for (AnsiColor item : AnsiColor.values()) { - if (StrUtil.equals(item.toString(), StrUtil.toString(code))) { + if (StrUtil.equals(item.toString(), StrUtil.toString(this.code))) { return item; } } - throw new IllegalArgumentException(StrUtil.format("No matched AnsiColor instance,code={}",code)); + throw new IllegalArgumentException(StrUtil.format("No matched AnsiColor instance,code={}",this.code)); } for (AnsiBackground item : AnsiBackground.values()) { - if (StrUtil.equals(item.toString(), StrUtil.toString(code+10))) { + if (StrUtil.equals(item.toString(), StrUtil.toString(this.code+10))) { return item; } } - throw new IllegalArgumentException(StrUtil.format("No matched Background instance,code={}",code)); + throw new IllegalArgumentException(StrUtil.format("No matched Background instance,code={}",this.code)); } if (foreOrBack == ForeOrBack.FORE){ - return Ansi8BitColor.foreground(code); + return Ansi8BitColor.foreground(this.code); } - return Ansi8BitColor.background(code); + return Ansi8BitColor.background(this.code); } @Override @@ -69,11 +69,11 @@ public class AnsiColorWrapper { return false; } AnsiColorWrapper that = (AnsiColorWrapper) o; - return code == that.code && bitDepth == that.bitDepth; + return this.code == that.code && this.bitDepth == that.bitDepth; } @Override public int hashCode() { - return Objects.hash(code, bitDepth); + return Objects.hash(this.code, this.bitDepth); } } From aab4d29dc234138209e46d54fa2424b9c9850b37 Mon Sep 17 00:00:00 2001 From: TomXin <766781886@qq.com> Date: Tue, 30 Aug 2022 13:14:11 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E5=B0=86=E6=95=B0=E5=AD=97=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E4=B8=BA=E5=B8=B8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/hutool/core/lang/ansi/AnsiColors.java | 112 +++++++++++++++--- 1 file changed, 96 insertions(+), 16 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColors.java b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColors.java index 70208cca0..f0aa749b5 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColors.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColors.java @@ -20,24 +20,104 @@ public final class AnsiColors { private static final Map ANSI_COLOR_MAP; + /** + * @see AnsiColor#BLACK + */ + private static final int CODE_OF_4_BIT_ANSI_COLOR_BLACK = 30; + + /** + * @see AnsiColor#RED + */ + private static final int CODE_OF_4_BIT_ANSI_COLOR_RED = 31; + + /** + * @see AnsiColor#GREEN + */ + private static final int CODE_OF_4_BIT_ANSI_COLOR_GREEN = 32; + + /** + * @see AnsiColor#YELLOW + */ + private static final int CODE_OF_4_BIT_ANSI_COLOR_YELLOW = 33; + + /** + * @see AnsiColor#BLUE + */ + private static final int CODE_OF_4_BIT_ANSI_COLOR_BLUE = 34; + + /** + * @see AnsiColor#MAGENTA + */ + private static final int CODE_OF_4_BIT_ANSI_COLOR_MAGENTA = 35; + + /** + * @see AnsiColor#CYAN + */ + private static final int CODE_OF_4_BIT_ANSI_COLOR_CYAN = 36; + + /** + * @see AnsiColor#WHITE + */ + private static final int CODE_OF_4_BIT_ANSI_COLOR_WHITE = 37; + + /** + * @see AnsiColor#BRIGHT_BLACK + */ + private static final int CODE_OF_4_BIT_ANSI_COLOR_BRIGHT_BLACK = 90; + + /** + * @see AnsiColor#BRIGHT_RED + */ + private static final int CODE_OF_4_BIT_ANSI_COLOR_BRIGHT_RED = 91; + + /** + * @see AnsiColor#BRIGHT_GREEN + */ + private static final int CODE_OF_4_BIT_ANSI_COLOR_BRIGHT_GREEN = 92; + + /** + * @see AnsiColor#BRIGHT_YELLOW + */ + private static final int CODE_OF_4_BIT_ANSI_COLOR_BRIGHT_YELLOW = 93; + + /** + * @see AnsiColor#BRIGHT_BLUE + */ + private static final int CODE_OF_4_BIT_ANSI_COLOR_BRIGHT_BLUE = 94; + + /** + * @see AnsiColor#BRIGHT_MAGENTA + */ + private static final int CODE_OF_4_BIT_ANSI_COLOR_BRIGHT_MAGENTA = 95; + + /** + * @see AnsiColor#BRIGHT_CYAN + */ + private static final int CODE_OF_4_BIT_ANSI_COLOR_BRIGHT_CYAN = 96; + + /** + * @see AnsiColor#BRIGHT_WHITE + */ + private static final int CODE_OF_4_BIT_ANSI_COLOR_BRIGHT_WHITE = 97; + static { Map colorMap = new LinkedHashMap<>(16); - colorMap.put(new AnsiColorWrapper(30,BitDepth.FOUR), new LabColor(0x000000)); - colorMap.put(new AnsiColorWrapper(31,BitDepth.FOUR), new LabColor(0xAA0000)); - colorMap.put(new AnsiColorWrapper(32,BitDepth.FOUR), new LabColor(0x00AA00)); - colorMap.put(new AnsiColorWrapper(33,BitDepth.FOUR), new LabColor(0xAA5500)); - colorMap.put(new AnsiColorWrapper(34,BitDepth.FOUR), new LabColor(0x0000AA)); - colorMap.put(new AnsiColorWrapper(35,BitDepth.FOUR), new LabColor(0xAA00AA)); - colorMap.put(new AnsiColorWrapper(36,BitDepth.FOUR), new LabColor(0x00AAAA)); - colorMap.put(new AnsiColorWrapper(37,BitDepth.FOUR), new LabColor(0xAAAAAA)); - colorMap.put(new AnsiColorWrapper(90,BitDepth.FOUR), new LabColor(0x555555)); - colorMap.put(new AnsiColorWrapper(91,BitDepth.FOUR), new LabColor(0xFF5555)); - colorMap.put(new AnsiColorWrapper(92,BitDepth.FOUR), new LabColor(0x55FF00)); - colorMap.put(new AnsiColorWrapper(93,BitDepth.FOUR), new LabColor(0xFFFF55)); - colorMap.put(new AnsiColorWrapper(94,BitDepth.FOUR), new LabColor(0x5555FF)); - colorMap.put(new AnsiColorWrapper(95,BitDepth.FOUR), new LabColor(0xFF55FF)); - colorMap.put(new AnsiColorWrapper(96,BitDepth.FOUR), new LabColor(0x55FFFF)); - colorMap.put(new AnsiColorWrapper(97,BitDepth.FOUR), new LabColor(0xFFFFFF)); + colorMap.put(new AnsiColorWrapper(CODE_OF_4_BIT_ANSI_COLOR_BLACK, BitDepth.FOUR), new LabColor(0x000000)); + colorMap.put(new AnsiColorWrapper(CODE_OF_4_BIT_ANSI_COLOR_RED, BitDepth.FOUR), new LabColor(0xAA0000)); + colorMap.put(new AnsiColorWrapper(CODE_OF_4_BIT_ANSI_COLOR_GREEN, BitDepth.FOUR), new LabColor(0x00AA00)); + colorMap.put(new AnsiColorWrapper(CODE_OF_4_BIT_ANSI_COLOR_YELLOW, BitDepth.FOUR), new LabColor(0xAA5500)); + colorMap.put(new AnsiColorWrapper(CODE_OF_4_BIT_ANSI_COLOR_BLUE, BitDepth.FOUR), new LabColor(0x0000AA)); + colorMap.put(new AnsiColorWrapper(CODE_OF_4_BIT_ANSI_COLOR_MAGENTA, BitDepth.FOUR), new LabColor(0xAA00AA)); + colorMap.put(new AnsiColorWrapper(CODE_OF_4_BIT_ANSI_COLOR_CYAN, BitDepth.FOUR), new LabColor(0x00AAAA)); + colorMap.put(new AnsiColorWrapper(CODE_OF_4_BIT_ANSI_COLOR_WHITE, BitDepth.FOUR), new LabColor(0xAAAAAA)); + colorMap.put(new AnsiColorWrapper(CODE_OF_4_BIT_ANSI_COLOR_BRIGHT_BLACK, BitDepth.FOUR), new LabColor(0x555555)); + colorMap.put(new AnsiColorWrapper(CODE_OF_4_BIT_ANSI_COLOR_BRIGHT_RED, BitDepth.FOUR), new LabColor(0xFF5555)); + colorMap.put(new AnsiColorWrapper(CODE_OF_4_BIT_ANSI_COLOR_BRIGHT_GREEN, BitDepth.FOUR), new LabColor(0x55FF00)); + colorMap.put(new AnsiColorWrapper(CODE_OF_4_BIT_ANSI_COLOR_BRIGHT_YELLOW, BitDepth.FOUR), new LabColor(0xFFFF55)); + colorMap.put(new AnsiColorWrapper(CODE_OF_4_BIT_ANSI_COLOR_BRIGHT_BLUE, BitDepth.FOUR), new LabColor(0x5555FF)); + colorMap.put(new AnsiColorWrapper(CODE_OF_4_BIT_ANSI_COLOR_BRIGHT_MAGENTA, BitDepth.FOUR), new LabColor(0xFF55FF)); + colorMap.put(new AnsiColorWrapper(CODE_OF_4_BIT_ANSI_COLOR_BRIGHT_CYAN, BitDepth.FOUR), new LabColor(0x55FFFF)); + colorMap.put(new AnsiColorWrapper(CODE_OF_4_BIT_ANSI_COLOR_BRIGHT_WHITE, BitDepth.FOUR), new LabColor(0xFFFFFF)); ANSI_COLOR_MAP = Collections.unmodifiableMap(colorMap); } From b877ae2a779f0fa236ef26cca939ba5a2a90288a Mon Sep 17 00:00:00 2001 From: Tom Xin <766781886@qq.com> Date: Thu, 1 Sep 2022 11:44:05 +0000 Subject: [PATCH 15/15] update AnsiColorWrapper.java Signed-off-by: Tom Xin <766781886@qq.com> --- .../main/java/cn/hutool/core/lang/ansi/AnsiColorWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColorWrapper.java b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColorWrapper.java index f7bdd0b53..b78487865 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColorWrapper.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/ansi/AnsiColorWrapper.java @@ -52,7 +52,7 @@ public class AnsiColorWrapper { return item; } } - throw new IllegalArgumentException(StrUtil.format("No matched Background instance,code={}",this.code)); + throw new IllegalArgumentException(StrUtil.format("No matched AnsiBackground instance,code={}",this.code)); } if (foreOrBack == ForeOrBack.FORE){ return Ansi8BitColor.foreground(this.code);