添加screenshot，准备更新readme

Author: devilsen

Screenshots/scan_code.gif

@@ -15,8 +15,6 @@ ImageScheduler::ImageScheduler(JNIEnv *env, MultiFormatReader *_reader,
     this->env = env;
     this->reader = _reader;
     this->javaCallHelper = javaCallHelper;
-    zbarScanner = new ImageScanner();
-    zbarScanner->set_config(ZBAR_QRCODE, ZBAR_CFG_ENABLE, 1);
     qrCodeRecognizer = new QRCodeRecognizer();
     decodeQr = true;
     stopProcessing.store(false);
@@ -27,7 +25,6 @@ ImageScheduler::~ImageScheduler() {
     DELETE(env);
     DELETE(reader);
     DELETE(javaCallHelper);
-    DELETE(zbarScanner);
     DELETE(qrCodeRecognizer);
     frameQueue.clear();
     delete &isProcessing;
@@ -174,10 +171,11 @@ void ImageScheduler::decodeZBar(const Mat &gray) {
 
     const void *raw = gray.data;
     Image image(width, height, "Y800", raw, width * height);
-    int n = zbarScanner->scan(image);
+    ImageScanner zbarScanner;
+    zbarScanner.set_config(ZBAR_QRCODE, ZBAR_CFG_ENABLE, 1);
 
     // 检测到二维码
-    if (n > 0) {
+    if (zbarScanner.scan(image) > 0) {
         Image::SymbolIterator symbol = image.symbol_begin();
         LOGE("zbar GrayPixels Success  Data = %s scanIndex = %d", symbol->get_data().c_str(),
              scanIndex);
@@ -334,7 +332,9 @@ Result ImageScheduler::readBitmap(jobject bitmap, int left, int top, int width,
 
     const void *raw = gray.data;
     Image image(gray.cols, gray.rows, "Y800", raw, gray.cols * gray.rows);
-    if (zbarScanner->scan(image) > 0) {
+    ImageScanner zbarScanner;
+    zbarScanner.set_config(ZBAR_QRCODE, ZBAR_CFG_ENABLE, 1);
+    if (zbarScanner.scan(image) > 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) {

Screenshots/write_1_2_code.jpg

@@ -68,7 +68,6 @@ class ImageScheduler {
     std::atomic<bool> isProcessing{};
     std::atomic<bool> stopProcessing{};
     double cameraLight{};
-    ImageScanner *zbarScanner;
     QRCodeRecognizer *qrCodeRecognizer;
     SafeQueue<FrameData> frameQueue;
     int scanIndex;

Screenshots/write_code.gif

@@ -46,7 +46,9 @@
         </activity>
         <activity android:name=".WriteQRCodeActivity" />
         <activity android:name=".CallBackTestActivity" />
-        <activity android:name=".CustomizeActivity" />
+        <activity
+            android:name=".CustomizeActivity"
+            android:launchMode="singleTop" />
 
     </application>
 

czxing/src/main/cpp/ImageScheduler.cpp

@@ -1,6 +1,8 @@
 package me.sam.czxing;
 
+import android.Manifest;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -19,15 +21,11 @@
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.yanzhenjie.permission.Action;
-import com.yanzhenjie.permission.AndPermission;
-import com.yanzhenjie.permission.runtime.Permission;
-
-import java.util.List;
-
 import me.devilsen.czxing.code.BarcodeFormat;
 import me.devilsen.czxing.code.BarcodeReader;
 import me.devilsen.czxing.code.CodeResult;
+import me.devilsen.czxing.compat.ActivityCompat;
+import me.devilsen.czxing.compat.ContextCompat;
 import me.devilsen.czxing.util.BarCodeUtil;
 import me.devilsen.czxing.util.ScreenUtil;
 import me.devilsen.czxing.util.SoundPoolUtil;
@@ -43,6 +41,8 @@
  */
 public class CustomizeActivity extends AppCompatActivity implements View.OnClickListener, ScanListener {
 
+    private static final int PERMISSIONS_REQUEST_CAMERA = 1;
+    private static final int PERMISSIONS_REQUEST_STORAGE = 2;
     private static final int CODE_SELECT_IMAGE = 100;
 
     private ScanView mScanView;
@@ -192,42 +192,43 @@ private void decodeImage(Intent intent) {
         showResult(result.getText());
     }
 
+    /**
+     * 获取摄像头权限（实际测试中，使用第三方获取权限工具，可能造成摄像头打开失败）
+     */
     private void requestCameraPermission() {
-        AndPermission.with(this)
-                .runtime()
-                .permission(Permission.Group.CAMERA)
-                .onGranted(new Action<List<String>>() {
-                    @Override
-                    public void onAction(List<String> data) {
-
-                    }
-                })
-                .onDenied(new Action<List<String>>() {
-                    @Override
-                    public void onAction(List<String> data) {
-
-                    }
-                })
-                .start();
+        if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA)
+                != PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(this,
+                    new String[]{Manifest.permission.CAMERA},
+                    PERMISSIONS_REQUEST_CAMERA);
+        }
     }
 
     private void requestStoragePermission() {
-        AndPermission.with(this)
-                .runtime()
-                .permission(Permission.Group.STORAGE)
-                .onGranted(new Action<List<String>>() {
-                    @Override
-                    public void onAction(List<String> data) {
-                        Intent albumIntent = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
-                        startActivityForResult(albumIntent, CODE_SELECT_IMAGE);
-                    }
-                })
-                .onDenied(new Action<List<String>>() {
-                    @Override
-                    public void onAction(List<String> data) {
-
-                    }
-                })
-                .start();
+        if (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE)
+                != PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(this,
+                    new String[]{Manifest.permission.READ_EXTERNAL_STORAGE},
+                    PERMISSIONS_REQUEST_STORAGE);
+        }
     }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        if (requestCode == PERMISSIONS_REQUEST_CAMERA) {
+            if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                mScanView.openCamera();
+                mScanView.startScan();
+            }
+            return;
+        } else if (requestCode == PERMISSIONS_REQUEST_STORAGE) {
+            if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                Intent albumIntent = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
+                startActivityForResult(albumIntent, CODE_SELECT_IMAGE);
+            }
+            return;
+        }
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+    }
+
 }