adjust scanPoint size

Author: devilsen

czxing/src/main/cpp/ImageScheduler.cpp

@@ -132,6 +132,10 @@ std::vector<ScanResult> ImageScheduler::decodeWeChat(const cv::Mat& gray)
  ScanResult result(res[i], codeRect);
  resultVector.push_back(result);
 
+// cv::Point point(rect.x + rect.width / 2, rect.y + rect.height / 2);
+// cv::circle(gray, point, 20, {255, 0, 0}, -1);
+// saveMat(gray, "result");
+
  LOGE("result = %s", res[i].c_str())
  LOGE("rect: x = %d, y = %d, width = %d, height = %d", rect.x, rect.y, rect.width, rect.height)
  }

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

@@ -80,6 +80,10 @@ Java_me_devilsen_czxing_code_NativeSdk_readByte(JNIEnv *env, jobject instance, j
  return -1;
  }
 
+ if (bytes_ == nullptr) {
+ return -1;
+ }
+
  jbyte *bytes = env->GetByteArrayElements(bytes_, nullptr);
 
  auto imageScheduler = reinterpret_cast<czxing::ImageScheduler *>(objPtr);

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

@@ -14,17 +14,13 @@
 public class BarcodeReader {
 
  private long _nativePtr;
- private static BarcodeReader instance;
+
+ private static final class InstanceHolder {
+ static final BarcodeReader instance = new BarcodeReader();
+ }
 
  public static BarcodeReader getInstance() {
- if (instance == null) {
- synchronized (BarcodeReader.class) {
- if (instance == null) {
- instance = new BarcodeReader();
- }
- }
- }
- return instance;
+ return InstanceHolder.instance;
  }
 
  private BarcodeReader() {
@@ -33,8 +29,7 @@ private BarcodeReader() {
  }
 
  public void setDetectModel(String detectorPrototxtPath, String detectorCaffeModelPath, String superResolutionPrototxtPath, String superResolutionCaffeModelPath) {
- NativeSdk.getInstance().setDetectModel(_nativePtr,
- detectorPrototxtPath, detectorCaffeModelPath,
+ NativeSdk.getInstance().setDetectModel(_nativePtr, detectorPrototxtPath, detectorCaffeModelPath,
  superResolutionPrototxtPath, superResolutionCaffeModelPath);
  }
 

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

@@ -50,6 +50,13 @@ private void init(Context context) {
  mPaint.setColor(mColor);
  }
 
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+ int size = MeasureSpec.makeMeasureSpec(mBigRadius * 2, MeasureSpec.EXACTLY);
+ setMeasuredDimension(size, size);
+ }
+
  @Override
  protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
  super.onLayout(changed, left, top, right, bottom);

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

@@ -1,7 +1,6 @@
 package me.devilsen.czxing.view.scanview;
 
 import android.content.Context;
-import android.graphics.Color;
 import android.util.AttributeSet;
 import android.view.View;
 
@@ -169,15 +168,16 @@ private void addPointView(CodeResult result) {
  view.setColor(mResultColor);
  }
 
- LayoutParams params = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
  int xOffset = (width - mPointSize) / 2;
  int yOffset = (height - mPointSize) / 2;
 
  xOffset = Math.max(xOffset, 0);
  yOffset = Math.max(yOffset, 0);
 
+ LayoutParams params = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
  params.leftMargin = x + xOffset;
  params.topMargin = y + yOffset;
+
  addView(view, params);
  }
 

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

@@ -3,8 +3,6 @@
 import android.app.Application;
 import android.content.Context;
 
-import com.tencent.bugly.crashreport.CrashReport;
-
 /**
  * desc :
  * date : 2019-06-25
@@ -19,7 +17,7 @@ public class MyApplication extends Application {
  public void onCreate() {
  super.onCreate();
  instance = this;
- CrashReport.initCrashReport(getApplicationContext(), "378dbc83d2", true);
+// CrashReport.initCrashReport(getApplicationContext(), "378dbc83d2", true);
  }
 
  public static Context getContext() {