stopScanning functionality - big fix for issue #23

KingsMentor · Aug 14, 2017 · fda0354 · fda0354
1 parent 5393225
commit fda0354
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 10 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,7 +5,7 @@ android {
     buildToolsVersion "24.0.2"
     defaultConfig {
         applicationId "xyz.belvi.mobilevisionbarcodesample"
-        minSdkVersion 11
+        minSdkVersion 14
         targetSdkVersion 24
         versionCode 1
         versionName "1.0"

diff --git a/app/src/main/java/xyz/belvi/mobilevisionbarcodesample/MainActivity.java b/app/src/main/java/xyz/belvi/mobilevisionbarcodesample/MainActivity.java
@@ -50,13 +50,15 @@ public class MainActivity extends AppCompatActivity implements BarcodeRetriever
     CheckBox fromXMl;
     SwitchCompat drawRect, autoFocus, supportMultiple, touchBack, drawText, flash, frontCam;
 
+    BarcodeCapture barcodeCapture;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
 
-        final BarcodeCapture barcodeCapture = (BarcodeCapture) getSupportFragmentManager().findFragmentById(barcode);
+        barcodeCapture = (BarcodeCapture) getSupportFragmentManager().findFragmentById(barcode);
         barcodeCapture.setRetrieval(this);
 
         fromXMl = (CheckBox) findViewById(R.id.from_xml);
@@ -71,7 +73,7 @@ protected void onCreate(Bundle savedInstanceState) {
         findViewById(R.id.stop).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-
+                barcodeCapture.stopScanning();
             }
         });
 
@@ -86,7 +88,7 @@ public void onClick(View view) {
                             .setTouchAsCallback(touchBack.isChecked())
                             .shouldAutoFocus(autoFocus.isChecked())
                             .setShowFlash(flash.isChecked())
-                            .setBarcodeFormat(Barcode.ISBN | Barcode.CODABAR)
+                            .setBarcodeFormat(Barcode.ALL_FORMATS)
                             .setCameraFacing(frontCam.isChecked() ? CameraSource.CAMERA_FACING_FRONT : CameraSource.CAMERA_FACING_BACK)
                             .setShouldShowText(drawText.isChecked());
                     barcodeCapture.refresh();

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -19,7 +19,7 @@
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
             app:gvb_auto_focus="true"
-            app:gvb_code_format="all_format"
+            app:gvb_code_format="code_39|aztec"
             app:gvb_flash="false"
             app:gvb_rect_colors="@array/rect_color" />
     </RelativeLayout>

diff --git a/build.gradle b/build.gradle
@@ -15,6 +15,9 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
     }
 }
 

diff --git a/mobilevisionbarcodescanner/build.gradle b/mobilevisionbarcodescanner/build.gradle
@@ -5,7 +5,7 @@ android {
     buildToolsVersion "24.0.2"
 
     defaultConfig {
-        minSdkVersion 11
+        minSdkVersion 14
         targetSdkVersion 24
         versionCode 1
         versionName "1.0"
@@ -20,7 +20,7 @@ android {
 }
 
 dependencies {
-    compile 'com.google.android.gms:play-services-vision:9.6.1'
+    compile 'com.google.android.gms:play-services-vision:11.0.4'
     compile 'com.tbruyelle.rxpermissions2:rxpermissions:0.9.1@aar'
     compile 'io.reactivex.rxjava2:rxjava:2.0.5'
 }
diff --git a/...ner/src/main/java/com/google/android/gms/samples/vision/barcodereader/BarcodeCapture.java b/...ner/src/main/java/com/google/android/gms/samples/vision/barcodereader/BarcodeCapture.java
@@ -77,6 +77,7 @@ public final class BarcodeCapture extends BarcodeFragment {
     // helper objects for detecting taps and pinches.
     private ScaleGestureDetector scaleGestureDetector;
     private GestureDetector gestureDetector;
+    private BarcodeDetector barcodeDetector;
 
 
     /**
@@ -155,7 +156,7 @@ private void createCameraSource(boolean autoFocus, boolean useFlash) {
         // is set to receive the barcode detection results, track the barcodes, and maintain
         // graphics for each barcode on screen.  The factory is used by the multi-processor to
         // create a separate tracker instance for each barcode.
-        BarcodeDetector barcodeDetector = new BarcodeDetector.Builder(getContext())
+        barcodeDetector = new BarcodeDetector.Builder(getContext())
                 .setBarcodeFormats(getBarcodeFormat())
                 .build();
 
@@ -441,4 +442,11 @@ public void onScaleEnd(ScaleGestureDetector detector) {
             mCameraSource.doZoom(detector.getScaleFactor());
         }
     }
+
+    @Override
+    public void stopScanning() {
+        super.stopScanning();
+        barcodeDetector.release();
+
+    }
 }
diff --git a/...ionbarcodescanner/src/main/java/xyz/belvi/mobilevisionbarcodescanner/BarcodeFragment.java b/...ionbarcodescanner/src/main/java/xyz/belvi/mobilevisionbarcodescanner/BarcodeFragment.java
@@ -153,4 +153,7 @@ protected BarcodeFragment setBarcodeFormatUpdate(boolean barcodeFormatUpdate) {
     public boolean isBarcodeFormatUpdate() {
         return barcodeFormatUpdate;
     }
+
+    public void stopScanning() {
+    }
 }
diff --git a/mobilevisionbarcodescanner/src/main/res/values/attrs.xml b/mobilevisionbarcodescanner/src/main/res/values/attrs.xml
@@ -14,7 +14,7 @@
             <enum name="back" value="0"></enum>
             <enum name="front" value="0"></enum>
         </attr>
-        <attr name="gvb_code_format" format="flag">
+        <attr name="gvb_code_format">
             <flag name="all_format" value="0"></flag>
             <flag name="code_128" value="1"></flag>
             <flag name="code_39" value="2"></flag>