加入set format api

Author: devilsen

czxing/src/main/cpp/CMakeLists.txt

@@ -14,7 +14,7 @@ include_directories(zxing)
 include_directories(include)
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -L${CMAKE_SOURCE_DIR}/../../../libs/${ANDROID_ABI}")
 
-add_compile_options(czxing "-O1" "-fPIC")
+#add_compile_options(czxing "-O1" "-fPIC")
 
 # 静态方式导入库
 add_library(opencv_core STATIC IMPORTED)

czxing/src/main/cpp/ImageScheduler.cpp

@@ -130,7 +130,7 @@ void ImageScheduler::preTreatMat(const FrameData &frameData) {
 
         // 分析亮度，如果亮度过低，不进行处理
         analysisBrightness(gray);
-        if (cameraLight < 40) {
+        if (cameraLight < 30) {
             return;
         }
 
@@ -259,7 +259,7 @@ void ImageScheduler::recognizerQrCode(const Mat &mat) {
 
     cv::Rect rect;
     qrCodeRecognizer->processData(mat, &rect);
-    if (rect.empty() || rect.height < 110) {
+    if (rect.empty() || rect.height < 100) {
         return;
     }
 

czxing/src/main/cpp/zxing/src/MultiFormatReader.cpp

@@ -79,9 +79,9 @@ MultiFormatReader::MultiFormatReader(const DecodeHints& hints)
 		}
 		_readers.emplace_back(new QRCode::Reader(hints));
 		_readers.emplace_back(new DataMatrix::Reader(hints));
-//		_readers.emplace_back(new Aztec::Reader());
-//		_readers.emplace_back(new Pdf417::Reader());
-//		_readers.emplace_back(new MaxiCode::Reader());
+		_readers.emplace_back(new Aztec::Reader());
+		_readers.emplace_back(new Pdf417::Reader());
+		_readers.emplace_back(new MaxiCode::Reader());
 		if (tryHarder) {
 			_readers.emplace_back(new OneD::Reader(hints));
 		}

czxing/src/main/java/me/devilsen/czxing/ScanActivity.java

@@ -84,17 +84,17 @@ private void initData() {
         if (option == null) {
             return;
         }
+        mScanView.setScanMode(option.getScanMode());
+        mScanView.setBarcodeFormat(option.getBarcodeFormat());
+
         ScanBoxView scanBox = mScanView.getScanBox();
         scanBox.setCornerColor(option.getCornerColor());
         scanBox.setBorderColor(option.getBorderColor());
-        mScanView.setScanMode(option.getScanMode());
         scanBox.setScanLineColor(option.getScanLineColors());
         scanBox.setFlashLightOnText(option.getFlashLightOnText());
         scanBox.setFlashLightOffText(option.getFlashLightOffText());
         scanBox.setScanNoticeText(option.getScanNoticeText());
 
-//        mScanView.setBarcodeFormat(BarcodeFormat.EAN_13);
-
         // 标题栏
         String title = option.getTitle();
         if (title != null) {

czxing/src/main/java/me/devilsen/czxing/ScannerManager.java

@@ -6,8 +6,10 @@
 import android.os.Parcelable;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
+import me.devilsen.czxing.code.BarcodeFormat;
 import me.devilsen.czxing.view.ScanActivityDelegate;
 
 /**
@@ -76,6 +78,11 @@ public ScannerManager setScanLineColors(List<Integer> scanLineColors) {
         return this;
     }
 
+    public ScannerManager setBarcodeFormat(BarcodeFormat... barcodeFormats){
+        scanOption.barcodeFormats = Arrays.asList(barcodeFormats);
+        return this;
+    }
+
     public ScannerManager setOnScanResultDelegate(ScanActivityDelegate.OnScanDelegate delegate) {
         ScanActivityDelegate.getInstance().setScanResultDelegate(delegate);
         return this;
@@ -105,6 +112,7 @@ public static class ScanOption implements Parcelable {
         private String flashLightOffText;
         private String scanNoticeText;
 
+        private List<BarcodeFormat> barcodeFormats;
         private List<Integer> scanLineColors;
 
         public int getCornerColor() {
@@ -147,6 +155,10 @@ public List<Integer> getScanLineColors() {
             return scanLineColors;
         }
 
+        public BarcodeFormat[] getBarcodeFormat() {
+            return barcodeFormats.toArray(new BarcodeFormat[0]);
+        }
+
         @Override
         public int describeContents() {
             return 0;
@@ -163,6 +175,7 @@ public void writeToParcel(Parcel dest, int flags) {
             dest.writeString(this.flashLightOnText);
             dest.writeString(this.flashLightOffText);
             dest.writeString(this.scanNoticeText);
+            dest.writeList(this.barcodeFormats);
             dest.writeList(this.scanLineColors);
         }
 
@@ -179,6 +192,8 @@ protected ScanOption(Parcel in) {
             this.flashLightOnText = in.readString();
             this.flashLightOffText = in.readString();
             this.scanNoticeText = in.readString();
+            this.barcodeFormats = new ArrayList<>();
+            in.readList(this.barcodeFormats, BarcodeFormat.class.getClassLoader());
             this.scanLineColors = new ArrayList<>();
             in.readList(this.scanLineColors, Integer.class.getClassLoader());
         }

czxing/src/main/java/me/devilsen/czxing/view/ScanView.java

@@ -65,6 +65,9 @@ public void onPreviewFrame(byte[] data, int left, int top, int width, int height
      * 设置扫描格式
      */
     public void setBarcodeFormat(BarcodeFormat... formats) {
+        if (formats == null || formats.length == 0) {
+            return;
+        }
         reader.setBarcodeFormat(formats);
     }
 

sample/src/main/java/me/sam/czxing/MainActivity.java

@@ -84,9 +84,10 @@ public void openScan(View view) {
                 .setScanLineColors(scanColors)
                 .setScanMode(ScanView.SCAN_MODE_MIX)
                 .setTitle("我的扫一扫")
-                .setScanNoticeText("扫描二维码")
-                .setFlashLightOnText("打开闪光灯")
-                .setFlashLightOffText("关闭闪光灯")
+//                .setBarcodeFormat(BarcodeFormat.EAN_13)
+//                .setScanNoticeText("扫描二维码")
+//                .setFlashLightOnText("打开闪光灯")
+//                .setFlashLightOffText("关闭闪光灯")
                 .showAlbum(true)
                 .continuousScan()
                 .setOnClickAlbumDelegate(new ScanActivityDelegate.OnClickAlbumDelegate() {