From bd33920077ceb08ae08951bcdc9e4bc5fa8925d2 Mon Sep 17 00:00:00 2001 From: Ivan Murashov Date: Fri, 8 Sep 2017 11:49:58 +0300 Subject: [PATCH] =?UTF-8?q?zxing=201.9.8=20=D1=80=D0=B5=D1=88=D0=B0=D0=B5?= =?UTF-8?q?=D1=82=20=D0=BF=D1=80=D0=BE=D0=B1=D0=BB=D0=B5=D0=BC=D1=8B=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=9D=D0=B5=D0=BA=D1=81=D1=83=D1=81=D0=B5=205?= =?UTF-8?q?=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/build.gradle | 2 +- .../java/com/dinect/checker/zxing/ScannerActivity.java | 7 +++++++ lib/consts.dart | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index d9f013c..13b5cd7 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -68,5 +68,5 @@ dependencies { compile 'com.android.support:appcompat-v7:25.0.0' compile 'com.squareup.okhttp3:okhttp:3.8.1' compile 'com.squareup.okio:okio:1.13.0' - compile 'me.dm7.barcodescanner:zxing:1.9.7' + compile 'me.dm7.barcodescanner:zxing:1.9.8' } diff --git a/android/app/src/main/java/com/dinect/checker/zxing/ScannerActivity.java b/android/app/src/main/java/com/dinect/checker/zxing/ScannerActivity.java index 180a388..16d2680 100644 --- a/android/app/src/main/java/com/dinect/checker/zxing/ScannerActivity.java +++ b/android/app/src/main/java/com/dinect/checker/zxing/ScannerActivity.java @@ -17,12 +17,16 @@ package com.dinect.checker.zxing; import android.os.Bundle; import android.os.Handler; +import android.util.Log; import android.view.View; import com.dinect.checker.AbstractScannerActivity; import com.dinect.checker.R; +import com.google.zxing.BarcodeFormat; import com.google.zxing.Result; +import java.util.ArrayList; + import me.dm7.barcodescanner.zxing.ZXingScannerView; /** @@ -45,6 +49,9 @@ public class ScannerActivity extends AbstractScannerActivity initToolbar(R.id.zxingToolbar, getString(R.string.scanner_title)); scannerView = (ZXingScannerView) initScanner(); + ArrayList formats = new ArrayList<>(); + formats.add(BarcodeFormat.UPC_EAN_EXTENSION); + scannerView.setFormats(formats); addScanner(scannerView, R.id.zxingRoot); } diff --git a/lib/consts.dart b/lib/consts.dart index 7234267..4f5a01a 100644 --- a/lib/consts.dart +++ b/lib/consts.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; // Serious constants -const String appName = "Dinect"; +const String appName = "AutoBonus"; -const String url = 'https://pos-api-int.dinect.com/20130701/'; -const String appToken = '9fec83cdca38c357e6b65dbb17514cdd36bf2a08'; +const String url = 'https://pos-api-autoclub.dinect.com/20130701/'; +const String appToken = 'bdea0f3ba9034b688019a7cac753d1209e2b227f'; // Assets const String logo_png = 'assets/registration_logo.png';