From 47143fe97d8962fd0f177fab3eb1a3b3c263cf47 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 21 Nov 2024 18:33:20 +0100 Subject: [PATCH] Fix sul caricamento degli ordini di acquisto --- .../core/expansion/BaseDialogFragment.java | 3 ++- .../PVOrdiniAcquistoRESTConsumer.java | 21 ++++++------------- .../DialogScanGrigliaAcquistoView.java | 5 ++++- build.gradle | 2 +- 4 files changed, 13 insertions(+), 18 deletions(-) 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 4cb8d6d9..42b9c1c0 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 @@ -91,8 +91,9 @@ public abstract class BaseDialogFragment extends DialogFragment implements Dialo public void onError(Exception ex) { + this.onLoadingEnded(); + requireActivity().runOnUiThread(() -> { - this.onLoadingEnded(); UtilityExceptions.defaultException(requireActivity(), ex); }); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PVOrdiniAcquistoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PVOrdiniAcquistoRESTConsumer.java index 16459e4d..930353f6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PVOrdiniAcquistoRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PVOrdiniAcquistoRESTConsumer.java @@ -17,7 +17,6 @@ import it.integry.integrywmsnative.core.rest.RESTBuilder; import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityLogger; -import it.integry.integrywmsnative.core.utility.UtilityThread; import it.integry.integrywmsnative.gest.contab_doc_interni.dto.ArtDTO; import it.integry.integrywmsnative.gest.contab_doc_interni.dto.OrdineDTO; import it.integry.integrywmsnative.gest.contab_doc_interni.dto.SaveDTO; @@ -42,17 +41,13 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer { public void onResponse(Call> call, Response> response) { var startTime = new Date().getTime(); analyzeAnswer(response, "retrieveArticoliOrdine", articoliOrdineWrapper -> { - UtilityThread.executeParallel(() -> { - Log.d("LOADING TIME 1", "MS: " + (new Date().getTime() - startTime)); - onSuccess.run(articoliOrdineWrapper); - }, false); + Log.d("LOADING TIME 1", "MS: " + (new Date().getTime() - startTime)); + onSuccess.run(articoliOrdineWrapper); }, onFailed); } @Override public void onFailure(Call> call, Throwable t) { - Log.e("getArticoliListino_pv", t.toString()); - UtilityLogger.error(new Exception(t)); onFailed.run(new Exception(t)); } }); @@ -66,17 +61,13 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer { public void onResponse(Call> call, Response> response) { var startTime = new Date().getTime(); analyzeAnswer(response, "retrieveArticoliOrdine", articoliOrdineWrapper -> { - UtilityThread.executeParallel(() -> { - Log.d("LOADING TIME 1", "MS: " + (new Date().getTime() - startTime)); - onSuccess.run(articoliOrdineWrapper); - }, false); + Log.d("LOADING TIME 1", "MS: " + (new Date().getTime() - startTime)); + onSuccess.run(articoliOrdineWrapper); }, onFailed); } @Override public void onFailure(Call> call, Throwable t) { - Log.e("getArticoliListino_pv", t.toString()); - UtilityLogger.error(new Exception(t)); onFailed.run(new Exception(t)); } }); @@ -105,7 +96,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer { public void onResponse(Call> call, Response> response) { var startTime = new Date().getTime(); analyzeAnswer(response, "retrieveArticoliOrdine", articoliOrdineWrapper -> { - UtilityThread.executeParallel(() -> { +// UtilityThread.executeParallel(() -> { // if (data == null) { // onFailed.run(new Exception("Nessun ordine generato")); // return; @@ -117,7 +108,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer { // ordine.setCodMdep(data.getCodMdep()); // ordine.setNumOrd(data.getNumOrd()); onSuccess.run(ordine); - }, false); +// }, false); }, onFailed); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanGrigliaAcquistoView.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanGrigliaAcquistoView.java index 05cf08fe..048baa31 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanGrigliaAcquistoView.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/dialogs/DialogScanGrigliaAcquistoView.java @@ -130,8 +130,10 @@ public class DialogScanGrigliaAcquistoView extends BaseDialogFragment { this.onLoadingStarted(); String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep(); pvOrdiniAcquistoRESTConsumer.retrieveArticoli(codAlis, codMdep, dto -> { + this.onLoadingEnded(); - if (dto.getArticoli().size() == 0) { + + if (dto.getArticoli().isEmpty()) { if (UtilityString.isNullOrEmpty(codAlis)) { onFailed.run(new NoArtsFoundException()); } else { @@ -146,6 +148,7 @@ public class DialogScanGrigliaAcquistoView extends BaseDialogFragment { mGriglia.setDescrDepo(dto.getDescrDepo()); mListArticoli = dto.getArticoli(); this.dismiss(); + }, onFailed); } diff --git a/build.gradle b/build.gradle index aeeee85b..b8a52f85 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { ext { kotlin_version = '1.9.20' - agp_version = '8.7.1' + agp_version = '8.7.2' } repositories {