diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 70bef5e6..968823bb 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index 30aa626c..00000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 00000000..15a15b21
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d0657fda..08b4c110 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -13,6 +13,7 @@
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 694ab0c8..d1a606f1 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -8,6 +8,7 @@
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index d0ad54a2..a717b639 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -144,6 +144,7 @@ dependencies {
implementation 'com.github.javiersantos:AppUpdater:2.7'
//Barcode
implementation project(':pointmobilescannerlibrary')
+ implementation project(':zebrascannerlibrary')
implementation project(path: ':barcode_base_library')
}
repositories {
diff --git a/app/src/main/assets/EMDKConfig.xml b/app/src/main/assets/EMDKConfig.xml
new file mode 100644
index 00000000..abffcc02
--- /dev/null
+++ b/app/src/main/assets/EMDKConfig.xml
@@ -0,0 +1,244 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeManager.java b/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeManager.java
index 3b242f38..15b18cd5 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeManager.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeManager.java
@@ -11,6 +11,7 @@ import it.integry.integrywmsnative.core.utility.UtilityLogger;
import it.integry.plugins.barcode_base_library.exception.BarcodeAdapterNotFoundException;
import it.integry.plugins.barcode_base_library.interfaces.BarcodeReaderInterface;
import it.integry.pointmobilescannerlibrary.PointMobileBarcodeReader;
+import it.integry.zebrascannerlibrary.ZebraBarcodeReader;
public class BarcodeManager {
@@ -23,7 +24,8 @@ public class BarcodeManager {
private static Class[] registeredBarcodeReaderInterfaces = new Class[]{
- PointMobileBarcodeReader.class
+ PointMobileBarcodeReader.class,
+ ZebraBarcodeReader.class
};
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java
index 7cf6e6eb..615ff2e3 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java
@@ -107,7 +107,7 @@ public class UtilityBarcode {
for (int i = 0; i < 12; i++) {
tot = tot + (Long.parseLong(String.valueOf(ean.charAt(i))) * (i % 2 == 0 ? 1 : 3));
}
- return tot % 10 == 0 ? "0" : "" +(10-(tot % 10));
+ return tot % 10 == 0 ? "0" : "" + ( 10 - ( tot % 10));
}
}
diff --git a/barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/interfaces/BarcodeReaderInterface.java b/barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/interfaces/BarcodeReaderInterface.java
index 1fd91786..616869f3 100644
--- a/barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/interfaces/BarcodeReaderInterface.java
+++ b/barcode_base_library/src/main/java/it/integry/plugins/barcode_base_library/interfaces/BarcodeReaderInterface.java
@@ -10,6 +10,8 @@ public interface BarcodeReaderInterface {
void init() throws BarcodeAdapterNotFoundException;
+ void deinit();
+
void register(RunnableArgs onScanSuccessfull, RunnableArgs onScanFailed);
String getAdapterName();
diff --git a/build.gradle b/build.gradle
index 66ddbd98..fde184ee 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.3.2'
+ classpath 'com.android.tools.build:gradle:3.4.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.2.0'
classpath 'com.google.firebase:firebase-plugins:1.1.5'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4d36ac1b..7ae5a961 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jan 16 12:23:01 CET 2019
+#Thu Apr 18 18:31:44 CEST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/pointmobilescannerlibrary/src/main/java/it/integry/pointmobilescannerlibrary/PointMobileBarcodeReader.java b/pointmobilescannerlibrary/src/main/java/it/integry/pointmobilescannerlibrary/PointMobileBarcodeReader.java
index 89525723..bedac4db 100644
--- a/pointmobilescannerlibrary/src/main/java/it/integry/pointmobilescannerlibrary/PointMobileBarcodeReader.java
+++ b/pointmobilescannerlibrary/src/main/java/it/integry/pointmobilescannerlibrary/PointMobileBarcodeReader.java
@@ -58,6 +58,11 @@ public class PointMobileBarcodeReader implements BarcodeReaderInterface {
}
}
+ @Override
+ public void deinit() {
+
+ }
+
@Override
public void register(RunnableArgs onScanSuccessfull, RunnableArgs onScanFailed) {
mOnScanSuccessfull = onScanSuccessfull;
diff --git a/settings.gradle b/settings.gradle
index 9f78635f..0d4c4158 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':pointmobilescannerlibrary', ':barcode_base_library', ':dynamic_vgalimenti', ':dynamic__base'
+include ':app', ':pointmobilescannerlibrary', ':barcode_base_library', ':dynamic_vgalimenti', ':dynamic__base', ':zebrascannerlibrary'
diff --git a/zebrascannerlibrary/.gitignore b/zebrascannerlibrary/.gitignore
new file mode 100644
index 00000000..796b96d1
--- /dev/null
+++ b/zebrascannerlibrary/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/zebrascannerlibrary/build.gradle b/zebrascannerlibrary/build.gradle
new file mode 100644
index 00000000..f15207a1
--- /dev/null
+++ b/zebrascannerlibrary/build.gradle
@@ -0,0 +1,35 @@
+apply plugin: 'com.android.library'
+
+android {
+ compileSdkVersion 28
+
+
+ defaultConfig {
+ minSdkVersion 21
+ targetSdkVersion 28
+ versionCode 1
+ versionName "1.0"
+
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+ }
+
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+ }
+ }
+
+}
+
+dependencies {
+
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+ implementation 'androidx.appcompat:appcompat:1.0.2'
+ testImplementation 'junit:junit:4.12'
+ androidTestImplementation 'androidx.test:runner:1.1.1'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+ implementation project(path: ':barcode_base_library')
+}
diff --git a/zebrascannerlibrary/proguard-rules.pro b/zebrascannerlibrary/proguard-rules.pro
new file mode 100644
index 00000000..f1b42451
--- /dev/null
+++ b/zebrascannerlibrary/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/zebrascannerlibrary/src/androidTest/java/it/integry/zebrascannerlibrary/ExampleInstrumentedTest.java b/zebrascannerlibrary/src/androidTest/java/it/integry/zebrascannerlibrary/ExampleInstrumentedTest.java
new file mode 100644
index 00000000..40b89d5d
--- /dev/null
+++ b/zebrascannerlibrary/src/androidTest/java/it/integry/zebrascannerlibrary/ExampleInstrumentedTest.java
@@ -0,0 +1,27 @@
+package it.integry.zebrascannerlibrary;
+
+import android.content.Context;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see Testing documentation
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+ @Test
+ public void useAppContext() {
+ // Context of the app under test.
+ Context appContext = InstrumentationRegistry.getTargetContext();
+
+ assertEquals("it.integry.zebrascannerlibrary.test", appContext.getPackageName());
+ }
+}
diff --git a/zebrascannerlibrary/src/main/AndroidManifest.xml b/zebrascannerlibrary/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..a1065825
--- /dev/null
+++ b/zebrascannerlibrary/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+
diff --git a/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeReader.java b/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeReader.java
new file mode 100644
index 00000000..44d8e3c7
--- /dev/null
+++ b/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeReader.java
@@ -0,0 +1,101 @@
+package it.integry.zebrascannerlibrary;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Build;
+
+import it.integry.plugins.barcode_base_library.exception.BarcodeAdapterNotFoundException;
+import it.integry.plugins.barcode_base_library.extension.RunnableArgs;
+import it.integry.plugins.barcode_base_library.interfaces.BarcodeReaderInterface;
+import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
+
+public class ZebraBarcodeReader implements BarcodeReaderInterface {
+
+ private final Context mContext;
+
+ private static RunnableArgs mOnScanSuccessfull;
+ private static RunnableArgs mOnScanFailed;
+
+ private static final String TAG = ZebraBarcodeReader.class.getName();
+ private static final String INTENT_FILTER_STRING = "it.integry.scan_filter";
+
+ public ZebraBarcodeReader(Context context) {
+ this.mContext = context;
+ }
+
+ @Override
+ public boolean isRightAdapter() {
+ String model = Build.MODEL;
+ if(model.equalsIgnoreCase("TC700H")) {
+ return true;
+ } else return false;
+ }
+
+ @Override
+ public void init() throws BarcodeAdapterNotFoundException {
+ if(isRightAdapter()) {
+ IntentFilter filter = new IntentFilter();
+ filter.addCategory(Intent.CATEGORY_DEFAULT);
+ filter.addAction(INTENT_FILTER_STRING);
+ mContext.registerReceiver(myBroadcastReceiver, filter);
+ } else {
+ throw new BarcodeAdapterNotFoundException(getAdapterName());
+ }
+ }
+
+ @Override
+ public void deinit() {
+ mContext.unregisterReceiver(myBroadcastReceiver);
+ }
+
+ @Override
+ public void register(RunnableArgs onScanSuccessfull, RunnableArgs onScanFailed) {
+ mOnScanSuccessfull = onScanSuccessfull;
+ mOnScanFailed = onScanFailed;
+ }
+
+
+ @Override
+ public String getAdapterName() {
+ return "Zebra";
+ }
+
+
+
+
+
+ private BroadcastReceiver myBroadcastReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ String action = intent.getAction();
+
+ if (action.equals(INTENT_FILTER_STRING)) {
+ try {
+ dispatchEvent(intent);
+ } catch (Exception e) {
+
+ }
+ }
+ }
+ };
+
+
+ private void dispatchEvent(Intent initiatingIntent)
+ {
+
+ String decodedSource = initiatingIntent.getStringExtra(mContext.getResources().getString(R.string.datawedge_intent_key_source));
+ String decodedData = initiatingIntent.getStringExtra(mContext.getResources().getString(R.string.datawedge_intent_key_data));
+ String decodedLabelType = initiatingIntent.getStringExtra(mContext.getResources().getString(R.string.datawedge_intent_key_label_type));
+
+ BarcodeScanDTO barcodeScanDTO = new BarcodeScanDTO()
+ .setByteValue(decodedData.getBytes())
+ .setStringValue(decodedData)
+ .setType(ZebraBarcodeTypeMapper.map(decodedLabelType))
+ .setName(decodedLabelType);
+// .setDecodingTime(mDecodeResult.decodeTimeMillisecond);
+
+ mOnScanSuccessfull.run(barcodeScanDTO);
+ }
+}
diff --git a/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeTypeMapper.java b/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeTypeMapper.java
new file mode 100644
index 00000000..6aee097f
--- /dev/null
+++ b/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeTypeMapper.java
@@ -0,0 +1,38 @@
+package it.integry.zebrascannerlibrary;
+
+import android.util.Log;
+
+import it.integry.plugins.barcode_base_library.model.BarcodeType;
+
+public class ZebraBarcodeTypeMapper {
+
+
+ public static BarcodeType map(String inputType) {
+
+ switch (inputType) {
+ case "LABEL-TYPE-CODE11":
+ return BarcodeType.CODE11;
+ case "LABEL-TYPE-CODE128":
+ return BarcodeType.CODE128;
+ case "LABEL-TYPE-CODE39":
+ return BarcodeType.CODE39;
+
+ case "LABEL-TYPE-EAN13":
+ return BarcodeType.EAN13;
+ case "LABEL-TYPE-EAN8":
+ return BarcodeType.EAN8;
+
+ case "LABEL-TYPE-UPCA":
+ return BarcodeType.UPCA;
+ case "LABEL-TYPE-UPCE0":
+ return BarcodeType.UPCE;
+ case "LABEL-TYPE-UPCE1":
+ return BarcodeType.UPCE1;
+ default:
+ Log.d("SCAN TYPE", inputType);
+ return null;
+ }
+
+ }
+
+}
diff --git a/zebrascannerlibrary/src/main/res/values/strings.xml b/zebrascannerlibrary/src/main/res/values/strings.xml
new file mode 100644
index 00000000..e9d54a64
--- /dev/null
+++ b/zebrascannerlibrary/src/main/res/values/strings.xml
@@ -0,0 +1,7 @@
+
+ Zebra ScannerLibrary
+
+ com.symbol.datawedge.source
+ com.symbol.datawedge.label_type
+ com.symbol.datawedge.data_string
+
diff --git a/zebrascannerlibrary/src/test/java/it/integry/zebrascannerlibrary/ExampleUnitTest.java b/zebrascannerlibrary/src/test/java/it/integry/zebrascannerlibrary/ExampleUnitTest.java
new file mode 100644
index 00000000..042c596d
--- /dev/null
+++ b/zebrascannerlibrary/src/test/java/it/integry/zebrascannerlibrary/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package it.integry.zebrascannerlibrary;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see Testing documentation
+ */
+public class ExampleUnitTest {
+ @Test
+ public void addition_isCorrect() {
+ assertEquals(4, 2 + 2);
+ }
+}
\ No newline at end of file