diff --git a/app/build.gradle b/app/build.gradle index 1fec3f27..6fb861a2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 279 - def appVersionName = '1.25.2' + def appVersionCode = 280 + def appVersionName = '1.25.3' signingConfigs { release { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java index c4cf07bc..cf747b03 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java @@ -826,7 +826,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta .setCanLUBeClosed(true) .setCanOverflowOrderQuantity(canOverflowQuantity); - if (!mDialogInputQuantityV2View.isAdded()) + if (!mDialogInputQuantityV2View.isVisible()) mDialogInputQuantityV2View .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO) .setOnComplete((resultDTO, shouldCloseLU) -> { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java index 9652072c..30043550 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java @@ -337,7 +337,7 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme .setCanPartitaMagBeChanged(canPartitaMagBeChanged) .setCanLUBeClosed(canLUBeClosed); - if (!mDialogInputQuantityV2View.isAdded()) + if (!mDialogInputQuantityV2View.isVisible()) mDialogInputQuantityV2View.setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO) .setOnComplete((resultDTO, shouldCloseLU) -> { PickedQuantityDTO pickedQuantityDTO = new PickedQuantityDTO() diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java index 2aab5722..e08796cc 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java @@ -318,7 +318,7 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag .setCanLUBeClosed(false) .setCanPartitaMagBeChanged(false); - if (!mDialogInputQuantityV2View.isAdded()) + if (!mDialogInputQuantityV2View.isVisible()) mDialogInputQuantityV2View .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO) .setOnComplete((resultDTO, shouldCloseLU) -> { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java index ad2e5b1a..557c217f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java @@ -201,7 +201,7 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl .setCanOverflowOrderQuantity(canOverflowOrderQuantity) .setCanLUBeClosed(canLUBeClosed); - if (!mDialogInputQuantityV2View.isAdded()) + if (!mDialogInputQuantityV2View.isVisible()) mDialogInputQuantityV2View .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO) .setOnComplete((resultDTO, shouldCloseLU) -> { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java index fe89dd74..59bfe4b7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java @@ -378,7 +378,7 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr .setCanPartitaMagBeChanged(canPartitaMagBeChanged) .setCanLUBeClosed(canLUBeClosed); - if (!mDialogInputQuantityV2View.isAdded()) + if (!mDialogInputQuantityV2View.isVisible()) mDialogInputQuantityV2View .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO) .setOnComplete((resultDTO, shouldCloseLU) -> { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java index 3bfbace5..db6cf599 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java @@ -6,6 +6,7 @@ import android.content.SharedPreferences; import android.content.res.Resources; import android.os.Bundle; import android.text.SpannableString; +import android.widget.Toast; import androidx.databinding.DataBindingUtil; import androidx.databinding.ObservableArrayList; @@ -810,7 +811,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo .setCanLUBeClosed(true) .setCanPartitaMagBeChanged(canPartitaMagBeChanged); - if (!mDialogInputQuantityV2View.isAdded()) + if (!mDialogInputQuantityV2View.isVisible()) mDialogInputQuantityV2View .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO) .setOnComplete((resultDTO, shouldCloseLU) -> { @@ -828,6 +829,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo this.mViewmodel.resetMatchedRows(); }) .show(getSupportFragmentManager(), "tag"); + else Toast.makeText(this, "Dialog giĆ  a video", Toast.LENGTH_LONG).show(); } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java index f58f23e4..8010faef 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java @@ -203,7 +203,7 @@ public class VersamentoMerceFragment extends BaseFragment implements ITitledFrag .setCanPartitaMagBeChanged(canBatchLotBeChanged) .setCanLUBeClosed(false); - if (!mDialogInputQuantityV2View.isAdded()) + if (!mDialogInputQuantityV2View.isVisible()) this.requireActivity().runOnUiThread(() -> { mDialogInputQuantityV2View .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO)