优化扫码策略

Author: devilsen

README.md

@@ -9,7 +9,7 @@ C++ port of ZXing for Android
 ### 使用
 在gradle中:
 ``` groovy
-implementation 'me.devilsen:CZXing:0.9.3'
+implementation 'me.devilsen:CZXing:0.9.6'
 ```
 建议加入abiFilters
 ```gradle

czxing/build.gradle

@@ -7,7 +7,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 19
-        versionName "0.9.5"
+        versionName "0.9.6"
 
         externalNativeBuild {
             cmake {

czxing/src/main/cpp/ImageScheduler.cpp

@@ -33,6 +33,7 @@ ImageScheduler::~ImageScheduler() {
     delete &stopProcessing;
     delete &cameraLight;
     delete &prepareThread;
+    scanIndex = 0;
 }
 
 void *prepareMethod(void *arg) {
@@ -49,6 +50,7 @@ void ImageScheduler::start() {
     stopProcessing.store(false);
     isProcessing.store(false);
     frameQueue.setWork(1);
+    scanIndex = 0;
 
     while (true) {
         if (stopProcessing.load()) {
@@ -74,6 +76,7 @@ void ImageScheduler::stop() {
     stopProcessing.store(true);
     frameQueue.setWork(0);
     frameQueue.clear();
+    scanIndex = 0;
 }
 
 void
@@ -109,7 +112,8 @@ ImageScheduler::process(jbyte *bytes, int left, int top, int cropWidth, int crop
  */
 void ImageScheduler::preTreatMat(const FrameData &frameData) {
     try {
-        LOGE("start preTreatMat...");
+        scanIndex++;
+        LOGE("start preTreatMat..., scanIndex = %d", scanIndex);
 
         Mat src(frameData.rowHeight + frameData.rowHeight / 2,
                 frameData.rowWidth, CV_8UC1,
@@ -128,7 +132,12 @@ void ImageScheduler::preTreatMat(const FrameData &frameData) {
         if (cameraLight < 40) {
             return;
         }
-        decodeGrayPixels(gray);
+
+        if (scanIndex % 2 == 0) {
+            decodeGrayPixels(gray);
+        } else {
+            decodeZBar(gray);
+        }
     } catch (const std::exception &e) {
         LOGE("preTreatMat error...");
     }
@@ -144,11 +153,38 @@ void ImageScheduler::decodeGrayPixels(const Mat &gray) {
 
     if (result.isValid()) {
         javaCallHelper->onResult(result);
-    }else {
+        LOGE("ZXing GrayPixels Success, scanIndex = %d", scanIndex);
+    } else {
         decodeThresholdPixels(gray);
     }
 }
 
+void ImageScheduler::decodeZBar(const Mat &gray) {
+    auto width = static_cast<unsigned int>(gray.cols);
+    auto height = static_cast<unsigned int>(gray.rows);
+
+    const void *raw = gray.data;
+    Image image(width, height, "Y800", raw, width * height);
+    int n = zbarScanner->scan(image);
+
+    if (n > 0) {
+        Image::SymbolIterator symbol = image.symbol_begin();
+        LOGE("zbar GrayPixels Success  Data = %s scanIndex = %d", symbol->get_data().c_str(),
+             scanIndex);
+
+        if (symbol->get_type() == zbar_symbol_type_e::ZBAR_QRCODE) {
+            Result result(DecodeStatus::NoError);
+            result.setFormat(BarcodeFormat::QR_CODE);
+            result.setText(ANSIToUnicode(symbol->get_data()));
+            javaCallHelper->onResult(result);
+            image.set_data(nullptr, 0);
+        }
+    } else {
+        image.set_data(nullptr, 0);
+        decodeAdaptivePixels(gray);
+    }
+}
+
 void ImageScheduler::decodeThresholdPixels(const Mat &gray) {
     LOGE("start ThresholdPixels...");
 
@@ -164,13 +200,17 @@ void ImageScheduler::decodeThresholdPixels(const Mat &gray) {
 
     Result result = decodePixels(mat);
     if (result.isValid()) {
+        LOGE("ZXing Threshold Success, scanIndex = %d", scanIndex);
         javaCallHelper->onResult(result);
     } else {
-        decodeAdaptivePixels(gray);
+        recognizerQrCode(gray);
     }
 }
 
 void ImageScheduler::decodeAdaptivePixels(const Mat &gray) {
+    if (scanIndex % 3 != 0) {
+        return;
+    }
     LOGE("start AdaptivePixels...");
 
     Mat mat;
@@ -185,39 +225,22 @@ void ImageScheduler::decodeAdaptivePixels(const Mat &gray) {
 
     Result result = decodePixels(lightMat);
     if (result.isValid()) {
+        LOGE("ZXing Adaptive Success, scanIndex = %d", scanIndex);
         javaCallHelper->onResult(result);
     } else {
-        decodeZBar(gray);
-//        recognizerQrCode(gray);
-    }
-}
-
-void ImageScheduler::decodeZBar(const Mat &gray) {
-    auto width = static_cast<unsigned int>(gray.cols);
-    auto height = static_cast<unsigned int>(gray.rows);
-
-    const void *raw = gray.data;
-    Image image(width, height, "Y800", raw, width * height);
-    int n = zbarScanner->scan(image);
-
-    if (n > 0) {
-        Image::SymbolIterator symbol = image.symbol_begin();
-        LOGE("zbar Code Data = %s", symbol->get_data().c_str());
-
-        if (symbol->get_type() == zbar_symbol_type_e::ZBAR_QRCODE) {
-            Result result(DecodeStatus::NoError);
-            result.setFormat(BarcodeFormat::QR_CODE);
-            result.setText(ANSIToUnicode(symbol->get_data()));
-            javaCallHelper->onResult(result);
-            image.set_data(nullptr, 0);
-        }
-    } else {
-        image.set_data(nullptr, 0);
         recognizerQrCode(gray);
     }
 }
 
 void ImageScheduler::recognizerQrCode(const Mat &mat) {
+    if (scanIndex % 7 == 0) {
+        javaCallHelper->onFocus();
+        return;
+    }
+
+    if (scanIndex % 3 != 0) {
+        return;
+    }
     LOGE("start recognizerQrCode...");
 
     cv::Rect rect;
@@ -240,7 +263,7 @@ void ImageScheduler::recognizerQrCode(const Mat &mat) {
 
     javaCallHelper->onResult(result);
 
-    LOGE("end recognizerQrCode...");
+    LOGE("end recognizerQrCode..., scanIndex = %d", scanIndex);
 }
 
 Result ImageScheduler::decodePixels(const Mat &mat) {

czxing/src/main/cpp/ImageScheduler.h

@@ -68,6 +68,7 @@ class ImageScheduler {
     ImageScanner *zbarScanner;
     QRCodeRecognizer *qrCodeRecognizer;
     SafeQueue<FrameData> frameQueue;
+    int scanIndex;
 
     pthread_t prepareThread{};
 

czxing/src/main/cpp/JavaCallHelper.cpp

@@ -36,6 +36,7 @@ JavaCallHelper::JavaCallHelper(JavaVM *_javaVM, JNIEnv *_env, jobject &_jobj) :
     }
 
     jmid_on_result = env->GetMethodID(jSdkClass, "onDecodeCallback", "(Ljava/lang/String;I[F)V");
+    jmid_on_focus = env->GetMethodID(jSdkClass, "onFocusCallback", "()V");
     jmid_on_brightness = env->GetMethodID(jSdkClass, "onBrightnessCallback", "(Z)V");
 
     if (jmid_on_result == nullptr) {
@@ -108,6 +109,25 @@ void JavaCallHelper::onResult(const ZXing::Result &result) {
 
 }
 
+void JavaCallHelper::onFocus() {
+    int getEnvStat = javaVM->GetEnv((void **) &env, JNI_VERSION_1_6);
+    int mNeedDetach = JNI_FALSE;
+    if (getEnvStat == JNI_EDETACHED) {
+        //如果没有， 主动附加到jvm环境中，获取到env
+        if (javaVM->AttachCurrentThread(&env, nullptr) != JNI_OK) {
+            return;
+        }
+        mNeedDetach = JNI_TRUE;
+    }
+
+    env->CallVoidMethod(jSdkObject, jmid_on_focus);
+
+    //释放当前线程
+    if (mNeedDetach) {
+        javaVM->DetachCurrentThread();
+    }
+}
+
 void JavaCallHelper::onBrightness(const bool isDark) {
     int getEnvStat = javaVM->GetEnv((void **) &env, JNI_VERSION_1_6);
     int mNeedDetach = JNI_FALSE;

czxing/src/main/cpp/JavaCallHelper.h

@@ -17,13 +17,16 @@ class JavaCallHelper {
 
     void onResult(const ZXing::Result &result);
 
+    void onFocus();
+
     void onBrightness(const bool isDark);
 
 private:
     JavaVM *javaVM;
     JNIEnv *env;
     jobject jSdkObject;
     jmethodID jmid_on_result;
+    jmethodID jmid_on_focus;
     jmethodID jmid_on_brightness;
 
 };

czxing/src/main/java/me/devilsen/czxing/camera/CameraSurface.java

@@ -214,7 +214,7 @@ private void doubleTap() {
      */
     @Override
     public void onFrozen() {
-        BarCodeUtil.d("mCamera is frozen, start focus");
+        BarCodeUtil.d("mCamera is frozen, start focus x = " + focusCenter.x + " y = "+ focusCenter.y);
         handleFocus(focusCenter.x, focusCenter.y);
     }
 

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

@@ -88,6 +88,8 @@ public void setReadCodeListener(ReadCodeListener readCodeListener) {
     public interface ReadCodeListener {
         void onReadCodeResult(CodeResult result);
 
+        void onFocus();
+
         void onAnalysisBrightness(boolean isDark);
     }
 }

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

@@ -40,6 +40,16 @@ public void onDecodeCallback(String content, int formatIndex, float[] points) {
         }
     }
 
+    /**
+     * Native Callback for focus
+     *
+     */
+    public void onFocusCallback() {
+        if (readCodeListener != null) {
+            readCodeListener.onFocus();
+        }
+    }
+
     /**
      * Native callback for brightness
      *

czxing/src/main/java/me/devilsen/czxing/util/SoundPoolUtil.java

@@ -18,7 +18,7 @@ public class SoundPoolUtil {
     private int mSoundId = -1;
 
     public SoundPoolUtil() {
-        mSoundPool = new SoundPool(1, AudioManager.STREAM_NOTIFICATION, 0);
+        mSoundPool = new SoundPool(1, AudioManager.STREAM_RING, 0);
     }
 
     public void loadDefault(Context context) {