Working and returning Results CAM-9, CAM-6

wyyrepo · Apr 29, 2014 · f6469de · f6469de
1 parent b6508b9
commit f6469de
Showing 1 changed file with 23 additions and 15 deletions.
diff --git a/native/android/org/littlemonkey/qrscanner/NativeScannerImpl.java b/native/android/org/littlemonkey/qrscanner/NativeScannerImpl.java
@@ -2,39 +2,47 @@
 
 import android.app.Activity;
 import android.content.Intent;
-import android.widget.Toast;
 import android.text.TextUtils;
 import com.codename1.impl.android.IntentResultListener;
+import com.codename1.io.Log;
 import net.sourceforge.zbar.Symbol;
 import com.dm.zbar.android.scanner.*;
 
 public class NativeScannerImpl {
 
     public void scanQRCode() {
+        scanCode(true);
+    }
+
+    public void scanBarCode() {
+        scanCode(false);
+    }
+
+    private void scanCode(boolean qrCode) {
         final android.app.Activity ctx = com.codename1.impl.android.AndroidNativeUtil.getActivity();
         Intent intent = new Intent(ctx, ZBarScannerActivity.class);
+        if (qrCode) {
         intent.putExtra(ZBarConstants.SCAN_MODES, new int[]{Symbol.QRCODE});
-        com.codename1.impl.android.AndroidNativeUtil.startActivityForResult(intent,new IntentResultListener() {
+        } else {
+            intent.putExtra(ZBarConstants.SCAN_MODES, new int[]{Symbol.EAN13});
+        }
+        com.codename1.impl.android.AndroidNativeUtil.startActivityForResult(intent, new IntentResultListener() {
             public void onActivityResult(int requestCode, int resultCode, Intent data) {
-                if (requestCode == 0) {
-                    if (resultCode == Activity.RESULT_OK) {
-                        QRScanner.getCallback().scanCompleted(data.getStringExtra(ZBarConstants.SCAN_RESULT), "QRCODE", data.getStringExtra(ZBarConstants.SCAN_RESULT).getBytes());
-                    } else if (resultCode == Activity.RESULT_CANCELED && data != null) {
-                        String error = data.getStringExtra(ZBarConstants.ERROR_INFO);
-                        if (!TextUtils.isEmpty(error)) {
-                            QRScanner.getCallback().scanError(100, error);
-                        } else {
-                            QRScanner.getCallback().scanCanceled();
-                        }
+                Log.p("SCANNER " + requestCode + " " + resultCode + " " + data.getStringExtra(ZBarConstants.SCAN_RESULT));
+                if (resultCode == Activity.RESULT_OK) {
+                    QRScanner.getCallback().scanCompleted(data.getStringExtra(ZBarConstants.SCAN_RESULT), "QRCODE", data.getStringExtra(ZBarConstants.SCAN_RESULT).getBytes());
+                } else if (resultCode == Activity.RESULT_CANCELED && data != null) {
+                    String error = data.getStringExtra(ZBarConstants.ERROR_INFO);
+                    if (!TextUtils.isEmpty(error)) {
+                        QRScanner.getCallback().scanError(100, error);
+                    } else {
+                        QRScanner.getCallback().scanCanceled();
                     }
                 }
             }
         });
     }
 
-    public void scanBarCode() {
-    }
-
     public boolean isSupported() {
         return true;
     }