Commit c88165e3 by Oscar Fuentes

Added getDevices function

parent 26ef8e36
...@@ -24,6 +24,8 @@ public class BarcodeScanChainway extends CordovaPlugin { ...@@ -24,6 +24,8 @@ public class BarcodeScanChainway extends CordovaPlugin {
Log.d(TAG, "execute: " + action); Log.d(TAG, "execute: " + action);
if (action.equalsIgnoreCase("scan")) { if (action.equalsIgnoreCase("scan")) {
PluginHelper.scan(cordova, webView, args, callbackContext); PluginHelper.scan(cordova, webView, args, callbackContext);
}else if(action.equalsIgnoreCase("getDevices")){
PluginHelper.getDevices(cordova, webView, args, callbackContext);
} }
return true; return true;
} }
......
package com.cocodin.barcodescan.plugin; package com.cocodin.barcodescan.plugin;
import java.util.Objects;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import com.rscja.utility.StringUtility;
import com.zebra.adc.decoder.Barcode2DWithSoft; import com.zebra.adc.decoder.Barcode2DWithSoft;
import org.apache.cordova.CordovaInterface; import org.apache.cordova.CordovaInterface;
...@@ -18,7 +17,6 @@ import org.json.JSONObject; ...@@ -18,7 +17,6 @@ import org.json.JSONObject;
import com.phonegap.plugins.barcodescanner.BarcodeScanner; import com.phonegap.plugins.barcodescanner.BarcodeScanner;
import android.content.Context; import android.content.Context;
import android.os.Message;
import android.util.Log; import android.util.Log;
public class PluginHelper { public class PluginHelper {
...@@ -27,9 +25,12 @@ public class PluginHelper { ...@@ -27,9 +25,12 @@ public class PluginHelper {
private static boolean threadStop = true; private static boolean threadStop = true;
private static ExecutorService executor; private static ExecutorService executor;
private static Barcode2DWithSoft mInstance; private static Barcode2DWithSoft mInstance;
private static JSONArray Devices = new JSONArray();
public static void init(CordovaInterface cordova) { public static void init(CordovaInterface cordova) {
Context context = cordova.getActivity(); Context context = cordova.getActivity();
Devices.put("camera");
Devices.put("scanner");
try { try {
mInstance = Barcode2DWithSoft.getInstance(); mInstance = Barcode2DWithSoft.getInstance();
if (mInstance != null) { if (mInstance != null) {
...@@ -45,11 +46,7 @@ public class PluginHelper { ...@@ -45,11 +46,7 @@ public class PluginHelper {
String device = ""; String device = "";
try { try {
device = args.get(0).toString(); device = args.get(0).toString();
} catch (JSONException e) { if (device.equalsIgnoreCase(Devices.getString(0))) {
e.printStackTrace();
callbackContext.sendPluginResult(new PluginResult(Status.ERROR, ""));
}
if (device.equalsIgnoreCase("scanner")) {
mInstance.setScanCallback(new Barcode2DWithSoft.ScanCallback() { mInstance.setScanCallback(new Barcode2DWithSoft.ScanCallback() {
@Override @Override
public void onScanComplete(int i, int length, byte[] data) { public void onScanComplete(int i, int length, byte[] data) {
...@@ -74,11 +71,19 @@ public class PluginHelper { ...@@ -74,11 +71,19 @@ public class PluginHelper {
}); });
mInstance.scan(); mInstance.scan();
} else if (device.equalsIgnoreCase("camera")) { } else if (device.equalsIgnoreCase(Devices.getString(1))) {
BarcodeScanner barcodeScanner = new BarcodeScanner(); BarcodeScanner barcodeScanner = new BarcodeScanner();
barcodeScanner.cordova = cordova; barcodeScanner.cordova = cordova;
barcodeScanner.webView = webView; barcodeScanner.webView = webView;
barcodeScanner.execute("scan", new JSONArray(), callbackContext); barcodeScanner.execute("scan", new JSONArray(), callbackContext);
} }
} catch (JSONException e) {
e.printStackTrace();
callbackContext.sendPluginResult(new PluginResult(Status.ERROR, ""));
}
}
public static void getDevices(CordovaInterface cordova, CordovaWebView webView, JSONArray args, final CallbackContext callbackContext){
callbackContext.sendPluginResult(new PluginResult(Status.OK, Devices));
} }
} }
var exec = require('cordova/exec'); cordova.define("barcode-scan-chainway.BarcodeScanChainway", function (require, exports, module) {
var exec = require('cordova/exec');
var PLUGIN_NAME = 'BarcodeScanChainway'; var PLUGIN_NAME = 'BarcodeScanChainway';
var BarcodeScanChainway = { var BarcodeScanChainway = {
scan: function (device, cb, error) { scan: function (device, cb, error) {
exec(cb, error, PLUGIN_NAME, 'scan', [device]); exec(cb, error, PLUGIN_NAME, 'scan', [device]);
},
getDevices: function (cb, error) {
exec(cb, error, PLUGIN_NAME, 'getDevices', []);
} }
}; };
module.exports = BarcodeScanChainway; module.exports = BarcodeScanChainway;
});
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment