Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Aggiunta personalizzazione dell'ean 128 reader per SaporiVeri

Browse Source
This commit is contained in:
Giuseppe Scorrano
2019-11-19 10:42:24 +01:00
parent 423a4daedc
commit 71e91d6681
22 changed files with 227 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -83,7 +83,7 @@ android {
abortOnError false
}
dynamicFeatures = [":dynamic__base", ":dynamic_vgalimenti", ":dynamic_ime", ":dynamic_frudis", ":dynamic_saporiveri_pv"]
dynamicFeatures = [":dynamic__base", ":dynamic_vgalimenti", ":dynamic_ime", ":dynamic_frudis", ":dynamic_saporiveri_pv", ":dynamic_saporiveri"]
}

3
app/src/main/java/it/integry/integrywmsnative/core/class_router/ClassRouter.java
View File

@@ -14,7 +14,8 @@ public class ClassRouter {
public enum PATH {
FILTRO_ORDINI_VENDITA,
ORDINI_VENDITA,
CUSTOM_CONFIGURATION
CUSTOM_CONFIGURATION,
BARCODE_CUSTOMIZATION
}
private static Context context;

7
app/src/main/java/it/integry/integrywmsnative/core/class_router/interfaces/IBarcodeCustomization.java Normal file
View File

@@ -0,0 +1,7 @@
package it.integry.integrywmsnative.core.class_router.interfaces;
public interface IBarcodeCustomization {
boolean shouldForceToEan13(String barcode);
}

11
app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/BarcodeRESTConsumer.java
View File

@@ -1,6 +1,8 @@
package it.integry.integrywmsnative.core.rest.consumers;
import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
import it.integry.integrywmsnative.core.class_router.ClassRouter;
import it.integry.integrywmsnative.core.class_router.interfaces.IBarcodeCustomization;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.core.rest.RESTBuilder;
import it.integry.integrywmsnative.core.rest.model.Ean128Model;
@@ -13,6 +15,15 @@ public class BarcodeRESTConsumer extends _BaseRESTConsumer {
public static void decodeEan128(BarcodeScanDTO barcodeObj, RunnableArgs<Ean128Model> onComplete, RunnableArgs<Exception> onFailed) {
IBarcodeCustomization barcodeCustomization = ClassRouter.getInstance(ClassRouter.PATH.BARCODE_CUSTOMIZATION);
if(barcodeCustomization != null && barcodeCustomization.shouldForceToEan13(barcodeObj.getStringValue())){
Ean128Model ean128Model = new Ean128Model();
ean128Model.Gtin = barcodeObj.getStringValue();
onComplete.run(ean128Model);
return;
}
String ean128 = barcodeObj.getStringValue().replaceAll("" + ((char) 29), "|");
BarcodeRESTConsumerService barcodeRESTConsumerService = RESTBuilder.getService(BarcodeRESTConsumerService.class);

1
app/src/main/res/values-it/strings.xml
View File

@@ -260,7 +260,6 @@
<string name="batch_lot_not_enabled">Il lotto <b>%s</b> non è attivo. Continuare?</string>
<string name="punto_vendita">Punto Vendita</string>
<string name="title_dynamic_saporiveri">Dynamic SaporiVeri</string>
<string name="title_dynamic_saporiveri_pv">SaporiVeri PV</string>
<string name="generate_orders">Genera ordini di acqusito</string>
<string name="transmitted_orders">Ordini di acquisto trasmessi</string>

2
app/src/main/res/values/strings.xml
View File

@@ -268,7 +268,6 @@
<string name="home">Home</string>
<string name="logout">Logout</string>
<string name="title_dynamic_saporiveri">Dynamic SaporiVeri</string>
<string name="title_dynamic_saporiveri_pv">SaporiVeri PV</string>
<string name="punto_vendita">Sale point</string>
<string name="generate_orders">Generate purchase orders</string>
@@ -295,4 +294,5 @@
<string name="choose_action">Choose action</string>
<string name="delete">Delete</string>
<string name="edit">Edit</string>
<string name="title_dynamic_saporiveri">SaporVeri Customization</string>
</resources>