修复一些问题

ailiwean · Jan 15, 2021 · 90af191 · 90af191
1 parent 7fc7122
commit 90af191
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/module_camera/src/main/java/com/ailiwean/core/zxing/CustomMultiFormatReader.java b/module_camera/src/main/java/com/ailiwean/core/zxing/CustomMultiFormatReader.java
@@ -154,18 +154,22 @@ public void reset() {
     }
 
     private Result decodeInternal(BinaryBitmap image) {
+        Result resultFinal = null;
         if (readers != null) {
             for (Reader reader : readers) {
                 try {
-                    return reader.decode(image, hints);
+                    Result result = reader.decode(image, hints);
+                    if (result != null)
+                        resultFinal = result;
+                    if (result != null && result.getText() != null)
+                        return resultFinal;
                 } catch (ReaderException re) {
                     // continue
                 } catch (Exception ignored) {
-
                 }
             }
         }
-        return null;
+        return resultFinal;
     }
 
 

diff --git a/module_camera/src/main/java/com/ailiwean/core/zxing/core/PlanarYUVLuminanceSource.java b/module_camera/src/main/java/com/ailiwean/core/zxing/core/PlanarYUVLuminanceSource.java
@@ -17,6 +17,7 @@
 package com.ailiwean.core.zxing.core;
 
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.ailiwean.core.zxing.core.common.HybridBinarizer;
 import com.ailiwean.core.zxing.core.common.HybridBinarizerCrude;

diff --git a/module_camera/src/main/java/com/ailiwean/core/zxing/core/qrcode/QRCodeReader.java b/module_camera/src/main/java/com/ailiwean/core/zxing/core/qrcode/QRCodeReader.java
@@ -68,7 +68,7 @@ public Result decode(BinaryBitmap image) throws NotFoundException, ChecksumExcep
 
     @Override
     public final Result decode(BinaryBitmap image, Map<DecodeHintType, ?> hints)
-            throws ChecksumException, FormatException {
+            throws ChecksumException, FormatException, NotFoundException {
         DecoderResult decoderResult;
         ResultPoint[] points;
         if (hints != null && hints.containsKey(DecodeHintType.PURE_BARCODE)) {
@@ -89,10 +89,10 @@ public final Result decode(BinaryBitmap image, Map<DecodeHintType, ?> hints)
                     try {
                         detectorResult = new Detector2(image.getBlackMatrix()).detect(hints);
                     } catch (NotFoundException notFoundException) {
-                        return null;
+                        throw NotFoundException.getNotFoundInstance();
                     }
                 } else
-                    return null;
+                    throw NotFoundException.getNotFoundInstance();
             }
             points = detectorResult.getPoints();
             try {