Commit 51fa4248 by Oscar Fuentes

Change call functions

parent e7497d8d
...@@ -20,6 +20,7 @@ public class BarcodeScanChainway extends CordovaPlugin { ...@@ -20,6 +20,7 @@ public class BarcodeScanChainway extends CordovaPlugin {
} }
public boolean execute(String action, JSONArray args, final CallbackContext callbackContext) { public boolean execute(String action, JSONArray args, final CallbackContext callbackContext) {
PluginHelper.init(cordova);
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);
......
...@@ -3,8 +3,6 @@ package com.cocodin.barcodescan.plugin; ...@@ -3,8 +3,6 @@ package com.cocodin.barcodescan.plugin;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import com.rscja.deviceapi.Barcode2D;
import com.rscja.deviceapi.exception.ConfigurationException;
import com.rscja.utility.StringUtility; import com.rscja.utility.StringUtility;
import com.zebra.adc.decoder.Barcode2DWithSoft; import com.zebra.adc.decoder.Barcode2DWithSoft;
...@@ -12,38 +10,35 @@ import org.apache.cordova.CordovaInterface; ...@@ -12,38 +10,35 @@ import org.apache.cordova.CordovaInterface;
import org.apache.cordova.CordovaWebView; import org.apache.cordova.CordovaWebView;
import org.apache.cordova.CallbackContext; import org.apache.cordova.CallbackContext;
import org.apache.cordova.PluginResult; import org.apache.cordova.PluginResult;
import org.apache.cordova.PluginResult.Status;
import org.json.JSONArray; import org.json.JSONArray;
import android.app.ProgressDialog;
import android.content.Context; import android.content.Context;
import android.os.AsyncTask;
import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.util.Log; import android.util.Log;
import android.widget.Toast;
public class PluginHelper { public class PluginHelper {
private static final String TAG = "PluginHelper"; private static final String TAG = "PluginHelper";
private static boolean threadStop = true; private static boolean threadStop = true;
private static String init_barcode;
private static ExecutorService executor; private static ExecutorService executor;
private static Barcode2DWithSoft mInstance; private static Barcode2DWithSoft mInstance;
public static void scan(CordovaInterface cordova, CordovaWebView webView, JSONArray args, public static void init(CordovaInterface cordova) {
final CallbackContext callbackContext) { Context context = cordova.getActivity();
Context context = null;
try { try {
context = cordova.getActivity();
mInstance = Barcode2DWithSoft.getInstance(); mInstance = Barcode2DWithSoft.getInstance();
if (mInstance != null) {
mInstance.open(context);
}
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, e.getMessage()); Log.e(TAG, e.getMessage());
return;
} }
}
mInstance.open(context); public static void scan(CordovaInterface cordova, CordovaWebView webView, JSONArray args,
final CallbackContext callbackContext) {
mInstance.setScanCallback(new Barcode2DWithSoft.ScanCallback() { mInstance.setScanCallback(new Barcode2DWithSoft.ScanCallback() {
@Override @Override
...@@ -57,11 +52,10 @@ public class PluginHelper { ...@@ -57,11 +52,10 @@ public class PluginHelper {
String barCode = new String(data); String barCode = new String(data);
barCode = barCode.replaceAll("\u0000", ""); barCode = barCode.replaceAll("\u0000", "");
Log.i(TAG, barCode); Log.i(TAG, barCode);
mInstance.stopScan(); mInstance.stopScan();
mInstance.close(); mInstance.close();
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, barCode)); callbackContext.sendPluginResult(new PluginResult(Status.OK, barCode));
} }
}); });
......
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