From 2adfda5f30b4ac45cdb5935f358b880b81a22496 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 18 Nov 2024 16:34:02 +0100 Subject: [PATCH 1/2] Ulteriori fix su DialogProgressView --- .../core/expansion/BaseActivity.java | 2 +- .../core/expansion/BaseDialogFragment.java | 2 +- .../core/expansion/BaseFragment.java | 2 +- .../gest/settings/MainSettingsFragment.java | 2 +- .../gest/spedizione/SpedizioneViewModel.java | 29 ++++++++----------- 5 files changed, 16 insertions(+), 21 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 7fbc2ab9..d96a6950 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 @@ -61,7 +61,7 @@ public class BaseActivity extends AppCompatActivity { private void closeProgress() { BarcodeManager.enable(); executorService.execute(() -> { - mCurrentProgress.dismissAllowingStateLoss(); + mCurrentProgress.dismiss(); }); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java index 8a426227..5f607310 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragment.java @@ -85,7 +85,7 @@ public abstract class BaseDialogFragment extends DialogFragment implements Dialo private void closeProgress() { BarcodeManager.enable(); executorService.execute(() -> { - mCurrentProgress.dismissAllowingStateLoss(); + mCurrentProgress.dismiss(); }); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java index 78c75012..3df725b5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java @@ -74,7 +74,7 @@ public abstract class BaseFragment extends Fragment { private void closeProgress() { BarcodeManager.enable(); executorService.execute(() -> { - mCurrentProgress.dismissAllowingStateLoss(); + mCurrentProgress.dismiss(); }); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java index 71d6f300..ac529751 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java @@ -316,7 +316,7 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT private void closeProgress() { executorService.execute(() -> { - mCurrentProgress.dismissAllowingStateLoss(); + mCurrentProgress.dismiss(); }); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java index 52d48cfb..ce43239c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java @@ -1,6 +1,5 @@ package it.integry.integrywmsnative.gest.spedizione; -import androidx.annotation.IntegerRes; import androidx.databinding.ObservableArrayList; import androidx.lifecycle.MutableLiveData; @@ -11,18 +10,15 @@ import java.time.LocalDate; import java.util.ArrayList; import java.util.Comparator; import java.util.Date; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; -import java.util.stream.Stream; import javax.inject.Inject; import it.integry.barcode_base_android_library.model.BarcodeScanDTO; -import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.CommonConst; import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService; import it.integry.integrywmsnative.core.exception.EmptyLUException; @@ -89,7 +85,6 @@ import it.integry.integrywmsnative.core.utility.UtilityBarcode; import it.integry.integrywmsnative.core.utility.UtilityBigDecimal; import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityPosizione; -import it.integry.integrywmsnative.core.utility.UtilityResources; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.gest.spedizione.exceptions.CurrentMonoLUPositionIsNotCorrectException; import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidMagazzinoAutomaticoMovementException; @@ -99,7 +94,6 @@ import it.integry.integrywmsnative.gest.spedizione.exceptions.OrdersLoadExceptio import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO; import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO; import it.integry.integrywmsnative.gest.spedizione.model.PrintOrderCloseDTO; -import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.exception.OverflowQtaTotOrderedQuantityException; import it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.TracciamentoImballoDTO; public class SpedizioneViewModel { @@ -193,19 +187,20 @@ public class SpedizioneViewModel { this.mUseQtaOrd = useQtaOrd; this.mUseColliPedana = useColliPedana; - if (enableGiacenza) { - mOrdiniRestConsumerService.getSuggestedPickingList(this.mDefaultCodMdep, pickingList, pickingObjectList -> { - this.mPickingList.postValue(pickingObjectList); - }, ex -> this.sendError(new OrdersLoadException(ex))); - } else { - getEmptyPickingList(pickingList, pickingObjectList -> { - this.mPickingList.postValue(pickingObjectList); - }); - } - getPartitaMagList(pickingList, mtbPartitaMagList -> { this.mPartitaMagList = mtbPartitaMagList; - this.sendOnLoadingEnded(); + + if (enableGiacenza) { + mOrdiniRestConsumerService.getSuggestedPickingList(this.mDefaultCodMdep, pickingList, pickingObjectList -> { + this.mPickingList.postValue(pickingObjectList); + this.sendOnLoadingEnded(); + }, ex -> this.sendError(new OrdersLoadException(ex))); + } else { + getEmptyPickingList(pickingList, pickingObjectList -> { + this.mPickingList.postValue(pickingObjectList); + this.sendOnLoadingEnded(); + }); + } }); this.mDefaultGestioneOfUL = gestioneCol; From 929c52b94ceb6f6db0225b309ccbbbf7f5e492e2 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 18 Nov 2024 16:36:45 +0100 Subject: [PATCH 2/2] -> v1.41.06 (454) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index beed556b..ff2d655c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 453 - def appVersionName = '1.41.05' + def appVersionCode = 454 + def appVersionName = '1.41.06' signingConfigs { release {