From aa93dc489e50339a58cf5614e1621da6d7571c05 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Tue, 20 Jul 2021 12:00:58 +0200 Subject: [PATCH 1/3] -> 1.17.5 (225) --- app/build.gradle | 4 ++-- .../it/integry/zebrascannerlibrary/ZebraBarcodeReader.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 99370e7a..8f904b94 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 224 - def appVersionName = '1.17.4' + def appVersionCode = 225 + def appVersionName = '1.17.5' signingConfigs { release { diff --git a/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeReader.java b/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeReader.java index 6479127b..41ff0e30 100644 --- a/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeReader.java +++ b/zebrascannerlibrary/src/main/java/it/integry/zebrascannerlibrary/ZebraBarcodeReader.java @@ -37,6 +37,8 @@ public class ZebraBarcodeReader implements BarcodeReaderInterface { return true; } else if(model.equalsIgnoreCase("TC210K")) { return true; + } else if(model.equalsIgnoreCase("TC21")) { + return true; } else if(model.equalsIgnoreCase("TC20")) { return true; } else return false; From e3d366b7a52f337a1230f84558ef9efcaf7e9c8c Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 20 Jul 2021 13:06:17 +0200 Subject: [PATCH 2/3] Fix su rendering in Rientro Merce da produzione --- app/build.gradle | 3 + app/src/main/AndroidManifest.xml | 2 +- .../input_lu_prod/DialogInputLUProdView.java | 11 +- .../DialogInputLUProdViewModel.java | 4 + .../layout-land-hdpi/dialog_input_lu_prod.xml | 27 ++-- .../main/res/layout/dialog_input_lu_prod.xml | 24 ++- ...tro_merce_order_list__list_group_model.xml | 141 +++++++++--------- 7 files changed, 109 insertions(+), 103 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8f904b94..c8687bce 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,6 +15,9 @@ android { keyPassword 'inpmiy' storeFile file('Integry.jks') storePassword 'inpmiy' + + enableV3Signing true + enableV4Signing true } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7678624d..7da50e84 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -36,7 +36,7 @@ + android:windowSoftInputMode="adjustNothing"> diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdView.java index abf05859..34475764 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdView.java @@ -130,6 +130,8 @@ public class DialogInputLUProdView extends BaseDialogFragment implements DialogI mBindings.setViewmodel(this.mViewModel); getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); + getDialog().setCanceledOnTouchOutside(false); + return mBindings.getRoot(); } @@ -373,7 +375,14 @@ public class DialogInputLUProdView extends BaseDialogFragment implements DialogI this.mViewModel.blockedNumCnf.set(false); this.mViewModel.blockedPesoLordo.set(false); - this.currentNumCnf.set(mDialogInputLUProdDTO.getNumCnf()); + + this.mViewModel.setInitialNumCnf(mDialogInputLUProdDTO.getNumCnf()); + this.mViewModel.setInitialPesoCollo(mDialogInputLUProdDTO.getQtaCnf()); + this.mViewModel.setInitialPesoNetto(mDialogInputLUProdDTO.getQtaTot()); + + this.mViewModel.refreshPesoLordo(); + + this.onDataChanged(); } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdViewModel.java index 2b7ef57a..beb11faf 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdViewModel.java @@ -209,6 +209,10 @@ public class DialogInputLUProdViewModel { return this; } + public void refreshPesoLordo() { + this.internalPesoLordo = this.calcPesoLordo(); + } + private BigDecimal calcPesoLordo() { BigDecimal taraPed = internalTaraPed != null ? internalTaraPed : BigDecimal.ZERO; return UtilityBigDecimal.multiply(this.internalNumCnf, this.internalPesoCollo.add(internalTaraCol)).add(taraPed); diff --git a/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml b/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml index 34954166..776865bc 100644 --- a/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml +++ b/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml @@ -34,9 +34,10 @@ app:cardCornerRadius="12dp" app:cardElevation="0dp"> - + android:orientation="vertical"> + android:imeOptions="actionDone"> - + diff --git a/app/src/main/res/layout/dialog_input_lu_prod.xml b/app/src/main/res/layout/dialog_input_lu_prod.xml index 1b466f1c..05f57e04 100644 --- a/app/src/main/res/layout/dialog_input_lu_prod.xml +++ b/app/src/main/res/layout/dialog_input_lu_prod.xml @@ -23,9 +23,10 @@ - + android:orientation="vertical"> - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml b/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml index 3d5544e3..061f4ca0 100644 --- a/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml +++ b/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml @@ -16,22 +16,22 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + android:background="@drawable/ripple_effect" android:orientation="horizontal" android:paddingStart="2dp" - android:paddingEnd="4dp" - android:background="@drawable/ripple_effect"> + android:paddingEnd="4dp"> + android:paddingBottom="8dp"> - + android:layout_toEndOf="@id/ordine_state_icon" + android:orientation="vertical"> - + android:layout_height="wrap_content"> - - - - - - - + android:layout_alignParentEnd="true" + tools:text="Cons 07 nov 2018" /> - + - - + + + + + + - + + + + + android:layout_height="wrap_content" + android:layout_toStartOf="@id/right_sub_descrizione" + android:paddingEnd="6dp" + tools:text="TextView" /> + - + - - - - - - From d782e8667aaa2187c34ae4fb18893892ef771e22 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 20 Jul 2021 13:07:01 +0200 Subject: [PATCH 3/3] -> v1.17.6 (226) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c8687bce..83a38b6e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 225 - def appVersionName = '1.17.5' + def appVersionCode = 226 + def appVersionName = '1.17.6' signingConfigs { release {