update barcode writer

Author: devilsen

czxing/src/main/cpp/native-lib.cpp

@@ -153,13 +153,16 @@ extern "C"
 JNIEXPORT jint JNICALL
 Java_me_devilsen_czxing_code_EncodeEngine_nativeWriteCode(JNIEnv *env, jobject instance, jstring content_,
  jint width, jint height, jint color,
- jstring format_, jobjectArray result) {
+ jstring format_, jint ecc, jint margin, jobjectArray result) {
  const char *content = env->GetStringUTFChars(content_, 0);
  const char *format = env->GetStringUTFChars(format_, 0);
 
  auto zxingFormat = ZXing::BarcodeFormatFromString(format);
  ZXing::CharacterSet encoding = ZXing::CharacterSet::UTF8;
- auto writer = ZXing::MultiFormatWriter(zxingFormat).setEncoding(encoding).setEccLevel(5);
+ auto writer = ZXing::MultiFormatWriter(zxingFormat)
+ .setEncoding(encoding)
+ .setEccLevel(ecc)
+ .setMargin(margin);
  ZXing::BitMatrix bitMatrix = writer.encode(content, width, height);
 
  if (bitMatrix.empty()) {

czxing/src/main/java/me/devilsen/czxing/code/BarcodeWriter.java

@@ -24,6 +24,7 @@ public BarcodeWriter() {
  *
  * @param text 要生成的文本
  * @param size 边长
+ *
  * @return bitmap二维码
  */
  public Bitmap write(String text, int size) {
@@ -36,6 +37,7 @@ public Bitmap write(String text, int size) {
  * @param text 要生成的文本
  * @param size 边长
  * @param color 要生成的二维码颜色
+ *
  * @return bitmap二维码
  */
  public Bitmap write(String text, int size, int color) {
@@ -49,6 +51,7 @@ public Bitmap write(String text, int size, int color) {
  * @param size 图片边长
  * @param color 要生成的二维码颜色
  * @param logo 放在中间的logo
+ *
  * @return bitmap二维码
  */
  public Bitmap write(String text, int size, int color, Bitmap logo) {
@@ -61,6 +64,7 @@ public Bitmap write(String text, int size, int color, Bitmap logo) {
  * @param text 要生成的文字（不支持中文）
  * @param width 图片宽
  * @param height 图片高
+ *
  * @return 一维码bitmap
  */
  public Bitmap writeBarCode(String text, int width, int height) {
@@ -74,6 +78,7 @@ public Bitmap writeBarCode(String text, int width, int height) {
  * @param width 图片宽
  * @param height 图片高
  * @param format 一维码格式
+ *
  * @return 一维码bitmap
  */
  public Bitmap writeBarCode(String text, int width, int height, BarcodeFormat format) {
@@ -87,6 +92,7 @@ public Bitmap writeBarCode(String text, int width, int height, BarcodeFormat for
  * @param width 图片宽
  * @param height 图片高
  * @param color 一维码颜色
+ *
  * @return 一维码bitmap
  */
  public Bitmap writeBarCode(String text, int width, int height, int color) {
@@ -102,11 +108,30 @@ public Bitmap writeBarCode(String text, int width, int height, int color) {
  * @param color 要生成的二维码颜色
  * @param format 要生成的条码格式
  * @param logo 放在中间的logo
+ *
  * @return bitmap二维码
  */
  private Bitmap write(String text, int width, int height, int color, BarcodeFormat format, Bitmap logo) {
+ return write(text, width, height, color, format, 5, 0, logo);
+ }
+
+ /**
+ * 生成图片
+ *
+ * @param text 要生成的文本
+ * @param width 图片宽
+ * @param height 图片高
+ * @param color 要生成的二维码颜色
+ * @param format 要生成的条码格式
+ * @param eccLevel 纠错级别[0-8]
+ * @param margin margin
+ * @param logo 放在中间的logo
+ *
+ * @return bitmap二维码
+ */
+ private Bitmap write(String text, int width, int height, int color, BarcodeFormat format, int eccLevel, int margin, Bitmap logo) {
  Object[] result = new Object[1];
- int resultCode = mEncodeEngine.writeCode(text, width, height, color, format.name(), result);
+ int resultCode = mEncodeEngine.writeCode(text, width, height, color, format, eccLevel, margin, result);
  Bitmap bitmap = null;
  if (resultCode > -1) {
  int[] pixels = (int[]) result[0];

czxing/src/main/java/me/devilsen/czxing/code/EncodeEngine.java

@@ -5,12 +5,19 @@
  */
 public class EncodeEngine {
 
- public int writeCode(String content, int width, int height, int color, String format, Object[] result) {
- return nativeWriteCode(content, width, height, color, format, result);
+ /**
+ * @param format {@link BarcodeFormat}
+ * @param ecc Error correction level, [0-8] Used for Aztec, PDF417, and QRCode only
+ * @param margin Margin around barcode, Used for all formats,sets the minimum number of quiet zone pixels.
+ *
+ * @return 0:success -1:fail
+ */
+ public int writeCode(String content, int width, int height, int color, BarcodeFormat format, int ecc, int margin, Object[] result) {
+ return nativeWriteCode(content, width, height, color, format.name(), ecc, margin, result);
  }
 
  // write
- private native int nativeWriteCode(String content, int width, int height, int color, String format, Object[] result);
+ private native int nativeWriteCode(String content, int width, int height, int color, String format, int ecc, int margin, Object[] result);
 
  static {
  System.loadLibrary("czxing");