ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

!722 修复QrCodeUtil对于DATA_MATRIX生成的形状随机不可指定的功能完善

Browse Source 
Merge pull request !722 from Husky/v5-dev
This commit is contained in:
Looly 2022-07-22 09:03:18 +00:00 committed by Gitee
commit 305e0fca07
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrConfig.java
View File

@ -5,6 +5,7 @@ import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.CharsetUtil;
import com.google.zxing.BarcodeFormat; import com.google.zxing.BarcodeFormat;
import com.google.zxing.EncodeHintType; import com.google.zxing.EncodeHintType;
import com.google.zxing.datamatrix.encoder.SymbolShapeHint;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import java.awt.Color; import java.awt.Color;
@ -44,6 +45,10 @@ public class QrConfig {
protected Image img; protected Image img;
/** 二维码中的Logo缩放的比例系数，如5表示长宽最小值的1/5 */ /** 二维码中的Logo缩放的比例系数，如5表示长宽最小值的1/5 */
protected int ratio = 6; protected int ratio = 6;
/**
* DATA_MATRIX的符号形状
*/
protected SymbolShapeHint shapeHint = SymbolShapeHint.FORCE_NONE;
/** /**
* 创建QrConfig * 创建QrConfig
@ -326,6 +331,17 @@ public class QrConfig {
return this; return this;
} }
/**
* 设置DATA_MATRIX的符号形状
*
* @param shapeHint DATA_MATRIX的符号形状
* @return this;
*/
public QrConfig setShapeHint(SymbolShapeHint shapeHint) {
this.shapeHint = shapeHint;
return this;
}
/** /**
* 转换为Zxing的二维码配置 * 转换为Zxing的二维码配置
* *
@ -357,6 +373,7 @@ public class QrConfig {
} }
hints.put(EncodeHintType.ERROR_CORRECTION, value); hints.put(EncodeHintType.ERROR_CORRECTION, value);
hints.put(EncodeHintType.DATA_MATRIX_SHAPE, shapeHint);
} }
if (null != this.margin) { if (null != this.margin) {
hints.put(EncodeHintType.MARGIN, this.margin); hints.put(EncodeHintType.MARGIN, this.margin);

17
hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java
View File

@ -5,6 +5,7 @@ import cn.hutool.core.img.ImgUtil;
import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.FileUtil;
import cn.hutool.core.lang.Console; import cn.hutool.core.lang.Console;
import com.google.zxing.BarcodeFormat; import com.google.zxing.BarcodeFormat;
import com.google.zxing.datamatrix.encoder.SymbolShapeHint;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Ignore; import org.junit.Ignore;
@ -84,16 +85,28 @@ public class QrCodeUtilTest {
@Test @Test
@Ignore @Ignore
public void decodeTest3(){ public void decodeTest3() {
final String decode = QrCodeUtil.decode(ImgUtil.read("d:/test/qr_a.png"), false, true); final String decode = QrCodeUtil.decode(ImgUtil.read("d:/test/qr_a.png"), false, true);
Console.log(decode); Console.log(decode);
} }
@Test @Test
public void pdf417Test(){ public void pdf417Test() {
final BufferedImage image = QrCodeUtil.generate("content111", BarcodeFormat.PDF_417, QrConfig.create()); final BufferedImage image = QrCodeUtil.generate("content111", BarcodeFormat.PDF_417, QrConfig.create());
Assert.assertNotNull(image); Assert.assertNotNull(image);
} }
@Test
public void generateDataMatrixTest() {
QrConfig qrConfig = QrConfig.create();
qrConfig.setShapeHint(SymbolShapeHint.FORCE_RECTANGLE);
final BufferedImage image = QrCodeUtil.generate("content111", BarcodeFormat.DATA_MATRIX, qrConfig);
Assert.assertNotNull(image);
QrConfig config = QrConfig.create();
config.setShapeHint(SymbolShapeHint.FORCE_SQUARE);
final BufferedImage imageSquare = QrCodeUtil.generate("content111", BarcodeFormat.DATA_MATRIX, qrConfig);
Assert.assertNotNull(imageSquare);
}
} }