优化识别本地二维码的流程

Author: devilsen

README.md

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

czxing/build.gradle

@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 21
-        versionName "0.9.9"
+        versionCode 22
+        versionName "0.9.10"
 
         externalNativeBuild {
             cmake {

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

@@ -49,11 +49,12 @@ public CodeResult read(Bitmap bitmap) {
             BarCodeUtil.e("bitmap is null");
             return null;
         }
-        Bitmap grayBitmap = SaveImageUtil.getBinaryzationBitmap(bitmap);
-        int imgWidth = grayBitmap.getWidth();
-        int imgHeight = grayBitmap.getHeight();
+        // 避免某些情况无法获取图片格式的问题
+        Bitmap newBitmap = bitmap.copy(Bitmap.Config.ARGB_8888, false);
+        int imgWidth = newBitmap.getWidth();
+        int imgHeight = newBitmap.getHeight();
         Object[] result = new Object[2];
-        int resultFormat = NativeSdk.getInstance().readBarcode(_nativePtr, grayBitmap, 0, 0, imgWidth, imgHeight, result);
+        int resultFormat = NativeSdk.getInstance().readBarcode(_nativePtr, newBitmap, 0, 0, imgWidth, imgHeight, result);
         if (resultFormat >= 0) {
             CodeResult decodeResult = new CodeResult(BarcodeFormat.values()[resultFormat], (String) result[0]);
             if (result[1] != null) {

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

@@ -103,7 +103,7 @@ public static Bitmap getDecodeAbleBitmap(String picturePath) {
             BitmapFactory.Options options = new BitmapFactory.Options();
             options.inJustDecodeBounds = true;
             BitmapFactory.decodeFile(picturePath, options);
-            int sampleSize = options.outHeight / 800;
+            int sampleSize = options.outHeight / 700;
             if (sampleSize <= 0) {
                 sampleSize = 1;
             }

sample/build.gradle

@@ -57,8 +57,8 @@ android {
 dependencies {
 
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-beta-3'
-    implementation project(':czxing')
-//    implementation 'me.devilsen:CZXing:0.9.9'
+//    implementation project(':czxing')
+    implementation 'me.devilsen:CZXing:0.9.10'
 
     implementation rootProject.ext.appcompat
     testImplementation rootProject.ext.junit

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

@@ -28,6 +28,7 @@
 import me.devilsen.czxing.compat.ActivityCompat;
 import me.devilsen.czxing.compat.ContextCompat;
 import me.devilsen.czxing.util.BarCodeUtil;
+import me.devilsen.czxing.util.BitmapUtil;
 import me.devilsen.czxing.util.ScreenUtil;
 import me.devilsen.czxing.util.SoundPoolUtil;
 import me.devilsen.czxing.view.ScanBoxView;
@@ -224,7 +225,7 @@ private void decodeImage(Intent intent) {
         String picturePath = cursor.getString(columnIndex);
         cursor.close();
 
-        Bitmap bitmap = BitmapFactory.decodeFile(picturePath);
+        Bitmap bitmap = BitmapUtil.getDecodeAbleBitmap(picturePath);
         if (bitmap == null) {
             return;
         }
@@ -252,11 +253,14 @@ private void requestCameraPermission() {
     }
 
     private void requestStoragePermission() {
-        if (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE)
-                != PackageManager.PERMISSION_GRANTED) {
+        int permission = ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE);
+        if (permission != PackageManager.PERMISSION_GRANTED) {
             ActivityCompat.requestPermissions(this,
                     new String[]{Manifest.permission.READ_EXTERNAL_STORAGE},
                     PERMISSIONS_REQUEST_STORAGE);
+        } else {
+            Intent albumIntent = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
+            startActivityForResult(albumIntent, CODE_SELECT_IMAGE);
         }
     }
 

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

@@ -29,6 +29,7 @@
 import me.devilsen.czxing.code.BarcodeReader;
 import me.devilsen.czxing.code.CodeResult;
 import me.devilsen.czxing.util.BarCodeUtil;
+import me.devilsen.czxing.util.BitmapUtil;
 import me.devilsen.czxing.view.ScanActivityDelegate;
 import me.devilsen.czxing.view.ScanView;
 
@@ -189,7 +190,8 @@ private void decodeImage(Intent intent) {
         String picturePath = cursor.getString(columnIndex);
         cursor.close();
 
-        Bitmap bitmap = BitmapFactory.decodeFile(picturePath);
+        // 适当压缩图片
+        Bitmap bitmap = BitmapUtil.getDecodeAbleBitmap(picturePath);
         if (bitmap == null) {
             return;
         }