From 33f4a7244d2b7d722667799ece4e28b66524546b Mon Sep 17 00:00:00 2001 From: ValerioC Date: Wed, 20 Nov 2019 11:00:34 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Abilitata,=20nella=20libreria=20di=20scansi?= =?UTF-8?q?one=20codici=20da=20emulazione=20di=20tastiera,=20la=20possibil?= =?UTF-8?q?it=C3=A0=20di=20ricevere=20l'evento=20come=20un=20ACTION=5FMULT?= =?UTF-8?q?IPLE=20contenente=20tutto=20il=20codice=20invece=20che=20caratt?= =?UTF-8?q?ere=20per=20carattere?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../integry/integrywmsnative/core/expansion/BaseActivity.java | 2 +- .../it/integry/integrywmsnative/core/expansion/BaseDialog.java | 2 +- .../KeyboardEmulatorBarcodeReader.java | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java index f73e4cb1..23103b9b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java @@ -12,7 +12,7 @@ public class BaseActivity extends AppCompatActivity { @Override public boolean dispatchKeyEvent(KeyEvent event) { if (BarcodeManager.isEnabled() && BarcodeManager.isKeyboardEmulator()) { - if (event.getAction() == KeyEvent.ACTION_DOWN) { + if (event.getAction() == KeyEvent.ACTION_DOWN || event.getAction() == KeyEvent.ACTION_MULTIPLE) { return BarcodeManager.onKeyDown(event.getKeyCode(), event); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialog.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialog.java index 2ce56ac8..278c3380 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialog.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialog.java @@ -20,7 +20,7 @@ public class BaseDialog extends Dialog { super(context); if (BarcodeManager.isEnabled() && BarcodeManager.isKeyboardEmulator()){ setOnKeyListener((dialog, keyCode, event) -> { - if (mBarcodeListener && event.getAction() == KeyEvent.ACTION_DOWN && !isControlKey(event)) { + if (mBarcodeListener && (event.getAction() == KeyEvent.ACTION_DOWN || event.getAction() == KeyEvent.ACTION_MULTIPLE) && !isControlKey(event)) { return BarcodeManager.onKeyDown(event.getKeyCode(), event); } return false; diff --git a/keyobardemulatorscannerlibrary/src/main/java/it/integry/keyobardemulatorscannerlibrary/KeyboardEmulatorBarcodeReader.java b/keyobardemulatorscannerlibrary/src/main/java/it/integry/keyobardemulatorscannerlibrary/KeyboardEmulatorBarcodeReader.java index 6bc32e4c..8091d60b 100644 --- a/keyobardemulatorscannerlibrary/src/main/java/it/integry/keyobardemulatorscannerlibrary/KeyboardEmulatorBarcodeReader.java +++ b/keyobardemulatorscannerlibrary/src/main/java/it/integry/keyobardemulatorscannerlibrary/KeyboardEmulatorBarcodeReader.java @@ -64,6 +64,8 @@ public class KeyboardEmulatorBarcodeReader implements BarcodeReaderInterface { mLastCharInsertTime =keyEvent.getEventTime(); if (keyEvent.getUnicodeChar() > 0){ mTextBarcode+= (char) keyEvent.getUnicodeChar(); + }else if (keyEvent.getCharacters() != null){ + mTextBarcode = keyEvent.getCharacters(); } } }else{ From c14df1e4d91d3cccdab46d04b444562d2e8437b7 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Wed, 20 Nov 2019 11:39:59 +0100 Subject: [PATCH 2/2] finish 1.9.6 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1355d59e..83c5b079 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 99 - def appVersionName = '1.9.5' + def appVersionCode = 100 + def appVersionName = '1.9.6' signingConfigs { release {