add ikea vendor specific codes, restrict itf to itf14

Author: ajungg

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog  
 All notable changes to this project will be documented in this file. 
 
+## [0.10.1] 
+
+## Added
+- Experimental support for IKEA vendor specific codes
+
+## Changed
+- ITF code detection is now restricted to ITF14
+
 ## [0.10.0]
 
 ### Added

build.gradle

@@ -24,7 +24,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion='0.10.0'
+        sdkVersion='0.10.1'
         versionCode=1
 
         compileSdkVersion=28

core/src/main/java/io/snabble/sdk/BarcodeFormat.java

@@ -5,7 +5,7 @@ public enum BarcodeFormat {
     CODE_128,
     EAN_8,
     EAN_13,
-    ITF,
+    ITF_14,
     QR_CODE,
     DATA_MATRIX;
 
@@ -20,7 +20,7 @@ public static BarcodeFormat parse(String str) {
             case "ean13":
                 return EAN_13;
             case "itf14":
-                return ITF;
+                return ITF_14;
             case "datamatrix":
                 return DATA_MATRIX;
             case "qr":

core/src/main/java/io/snabble/sdk/Project.java

@@ -21,6 +21,7 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import io.snabble.sdk.encodedcodes.EncodedCodesOptions;
+import io.snabble.sdk.utils.IntRange;
 import io.snabble.sdk.utils.JsonUtils;
 import io.snabble.sdk.utils.SimpleActivityLifecycleCallbacks;
 import okhttp3.OkHttpClient;
@@ -55,6 +56,7 @@ public class Project {
     private boolean verifyInternalEanChecksum;
     private BarcodeFormat[] supportedBarcodeFormats;
     private Shop checkedInShop;
+    private Map<BarcodeFormat, IntRange> barcodeFormatRanges;
 
     private Map<String, String> urls;
 
@@ -160,6 +162,12 @@ void parse(JsonObject jsonObject) {
             formats.add(BarcodeFormat.CODE_128);
         }
 
+        barcodeFormatRanges = new HashMap<>();
+        // TODO parse from metadata
+        if (id.contains("ikea")) {
+            barcodeFormatRanges.put(BarcodeFormat.ITF_14, new IntRange(0, 8));
+        }
+
         supportedBarcodeFormats = formats.toArray(new BarcodeFormat[formats.size()]);
 
         if (jsonObject.has("shops")) {
@@ -334,6 +342,14 @@ public Checkout getCheckout() {
         return checkout;
     }
 
+    public IntRange getRangeForBarcodeFormat(BarcodeFormat barcodeFormat) {
+        if (barcodeFormatRanges != null) {
+            return barcodeFormatRanges.get(barcodeFormat);
+        }
+
+        return null;
+    }
+
     Events getEvents() {
         return events;
     }

core/src/main/java/io/snabble/sdk/codes/EAN13.java

@@ -23,7 +23,7 @@ public class EAN13 extends ScannableCode implements Serializable {
     private boolean useGermanPrintPrefix;
 
     EAN13(Project project, String code) {
-        super(code);
+        super(project, code);
 
         if (!isEan13(code)) {
             throw new IllegalArgumentException("Not a valid EAN13 code");

core/src/main/java/io/snabble/sdk/codes/EAN14.java

@@ -1,8 +1,10 @@
 package io.snabble.sdk.codes;
 
+import io.snabble.sdk.Project;
+
 public class EAN14 extends ScannableCode {
-    EAN14(String code) {
-        super(code);
+    EAN14(Project project, String code) {
+        super(project, code);
 
         if (code.length() == 16) {
             this.code = code.substring(2, code.length());

core/src/main/java/io/snabble/sdk/codes/EdekaProductCode.java

@@ -9,7 +9,7 @@ public class EdekaProductCode extends ScannableCode {
     private String overriddenCode;
 
     EdekaProductCode(Project project, String code) {
-        super(code);
+        super(project, code);
 
         lookupCode = code.substring(2, 15);
         price = Integer.parseInt(code.substring(15, 21));

core/src/main/java/io/snabble/sdk/codes/IKEADataMatrixCode.java

@@ -0,0 +1,51 @@
+package io.snabble.sdk.codes;
+
+import org.apache.commons.lang3.StringUtils;
+import io.snabble.sdk.Project;
+
+public class IKEADataMatrixCode extends ScannableCode {
+    private String lookupCode;
+    private int price;
+
+    IKEADataMatrixCode(Project project, String code) {
+        super(project, code);
+
+        String[] split = code.split("\u001D");
+        String codePart = split[3];
+        String pricePart = split[4];
+
+        lookupCode = codePart.substring(3, codePart.length());
+        price = Integer.parseInt(pricePart.substring(pricePart.length() - 6, pricePart.length() - 1));
+        price *= 100; // price is in EUR
+    }
+
+    @Override
+    public String getLookupCode() {
+        return lookupCode;
+    }
+
+    @Override
+    public int getEmbeddedData() {
+        return price;
+    }
+
+    @Override
+    public boolean hasPriceData() {
+        return true;
+    }
+
+    @Override
+    public boolean hasEmbeddedData() {
+        return true;
+    }
+
+    @Override
+    public boolean isEmbeddedDataOk() {
+        return true;
+    }
+
+    public static boolean isIKEADataMatrixCode(Project project, String code) {
+        return project.getId().contains("ikea")
+                && StringUtils.countMatches(code, '\u001D') == 4;
+    }
+}

core/src/main/java/io/snabble/sdk/codes/ScannableCode.java

@@ -5,9 +5,11 @@
 import io.snabble.sdk.Project;
 
 public class ScannableCode implements Serializable {
+    protected final Project project;
     protected String code;
 
-    ScannableCode(String code) {
+    ScannableCode(Project project, String code) {
+        this.project = project;
         this.code = code;
     }
 
@@ -51,11 +53,13 @@ public static ScannableCode parse(Project project, String code) {
         if (EAN13.isEan13(code)) {
             return new EAN13(project, code);
         } else if (EAN14.isEan14(code)) {
-            return new EAN14(code);
+            return new EAN14(project, code);
         } else if (EdekaProductCode.isEdekaProductCode(project, code)) {
             return new EdekaProductCode(project, code);
-        } else {
-            return new ScannableCode(code);
+        } else if (IKEADataMatrixCode.isIKEADataMatrixCode(project, code)) {
+            return new IKEADataMatrixCode(project, code);
+        } else  {
+            return new ScannableCode(project, code);
         }
     }
 }

ui/src/main/java/io/snabble/sdk/ui/scanner/BarcodeScannerView.java

@@ -663,6 +663,13 @@ public void run() {
                             @Override
                             public void run() {
                                 if (decodeEnabled && callback != null && isAttachedToWindow && !isPaused) {
+                                    // ZXing decodes all ITF_14 lengths, but we only care about ITF14.
+                                    if (finalResult.getBarcodeFormat() == com.google.zxing.BarcodeFormat.ITF) {
+                                        if (finalResult.getText().length() != 14) {
+                                            return;
+                                        }
+                                    }
+
                                     Barcode barcode = new Barcode(
                                             ZXingHelper.fromZXingFormat(finalResult.getBarcodeFormat()),
                                             finalResult.getText(),