优化闪关灯的显示，删除一些无用的方法和文件

Author: devilsen

czxing/src/main/cpp/ImageUtil.cpp

@@ -21,7 +21,6 @@
 #include <stdexcept>
 #include <vector>
 #include <opencv2/core/types.hpp>
-#include <locale.h>
 
 namespace {
 
@@ -110,23 +109,9 @@ BinaryBitmapFromBytesC1(void *pixels, int left, int top, int width, int height)
     return std::make_shared<HybridBinarizer>(luminance);
 }
 
-bool AnalysisBrightness(JNIEnv *env, const jbyte *bytes, int width, int height) {
-
-}
-
 /**
  * string转wstring
  */
-std::wstring StringToWString(const std::string &src) {
-    unsigned long len = src.size() * 2;  // 预留字节数
-    setlocale(LC_CTYPE, "");        // 必须调用此函数,但是会造成污染
-    auto *p = new wchar_t[len];     // 申请一段内存存放转换后的字符串
-    mbstowcs(p, src.c_str(), len);  // 转换
-    std::wstring desc(p);
-    delete[] p;                     // 释放申请的内存
-    return desc;
-}
-
 std::string UnicodeToANSI(const std::wstring &wstr) {
     std::string ret;
     std::mbstate_t state = {};
@@ -214,22 +199,4 @@ ToJavaArray(JNIEnv *env, const std::vector<ZXing::ResultPoint> &input) {
     }
 
     return array;
-}
-
-jintArray
-reactToJavaArray(JNIEnv *env, const cv::Rect &rect) {
-    jintArray array = env->NewIntArray(6);
-
-    cv::Point pointLeftTop = rect.tl();
-    cv::Point pointRightBottom = rect.br();
-    env->SetIntArrayRegion(array, 0, 1, &pointLeftTop.x);
-    env->SetIntArrayRegion(array, 1, 1, &pointLeftTop.y);
-
-    env->SetIntArrayRegion(array, 2, 1, &pointRightBottom.x);
-    env->SetIntArrayRegion(array, 3, 1, &pointLeftTop.y);
-
-    env->SetIntArrayRegion(array, 4, 1, &pointLeftTop.x);
-    env->SetIntArrayRegion(array, 5, 1, &pointRightBottom.y);
-
-    return array;
-}
+}

czxing/src/main/cpp/ImageUtil.h

@@ -39,11 +39,8 @@ class BinaryBitmap;
 std::shared_ptr<ZXing::BinaryBitmap> BinaryBitmapFromJavaBitmap(JNIEnv* env, jobject bitmap, int cropLeft, int cropTop, int cropWidth, int cropHeight);
 std::shared_ptr<ZXing::BinaryBitmap> BinaryBitmapFromBytesC4(JNIEnv* env, void *rgbScale, int cropLeft, int cropTop, int cropWidth, int cropHeight);
 std::shared_ptr<ZXing::BinaryBitmap> BinaryBitmapFromBytesC1(void *grayScale, int cropLeft, int cropTop, int cropWidth, int cropHeight);
-bool AnalysisBrightness(JNIEnv* env,const jbyte *bytes, int width, int height);
-std::wstring StringToWString(const std::string &src);
 std::string UnicodeToANSI(const std::wstring & wstr);
 std::wstring ANSIToUnicode(const std::string &src);
 void ThrowJavaException(JNIEnv* env, const char* message);
 jstring ToJavaString(JNIEnv* env, const std::wstring& str);
 jfloatArray ToJavaArray(JNIEnv* env, const std::vector<ZXing::ResultPoint>& vector);
-jintArray reactToJavaArray(JNIEnv *env, const cv::Rect &rect);

czxing/src/main/cpp/JNIUtils.cpp

@@ -5,7 +5,6 @@
 #include <opencv2/imgproc/types_c.h>
 #include "QRCodeRecognizer.h"
 #include "opencv2/opencv.hpp"
-#include "JNIUtils.h"
 
 using namespace cv;
 using namespace std;

czxing/src/main/cpp/JNIUtils.h

@@ -6,7 +6,6 @@
 #include "Result.h"
 #include "QRCodeRecognizer.h"
 #include "opencv2/opencv.hpp"
-#include "ImageUtil.h"
 #include <vector>
 #include <opencv2/imgproc/types_c.h>
 #include "MultiFormatWriter.h"

czxing/src/main/cpp/QRCodeRecognizer.cpp

@@ -120,8 +120,17 @@ public void onAnalysisBrightness(boolean isDark) {
             }
         }
 
-        this.isDark = show >= DARK_LIST_SIZE;
-        mScanBoxView.setDark(isDark);
+        if (this.isDark) {
+            if (show <= 2) {
+                this.isDark = false;
+                mScanBoxView.setDark(false);
+            }
+        } else {
+            if (show >= DARK_LIST_SIZE) {
+                this.isDark = true;
+                mScanBoxView.setDark(true);
+            }
+        }
     }
 
     public void resetZoom() {