From 099d5fa54d35af7ad2ae28008c1ba1efe03e8275 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 15 Jun 2023 16:47:37 +0200 Subject: [PATCH 1/2] Ripristinata visualizzazione del cliente in creazione UL in Spedizione. Sistemato provider del mainHandler --- .../integry/integrywmsnative/MainApplicationModule.java | 3 +-- .../db/respository_new/InventarioRepository.java | 7 +++++-- .../integrywmsnative/core/utility/UtilityExceptions.java | 4 ++-- .../gest/spedizione/SpedizioneViewModel.java | 8 ++++++++ 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java b/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java index 51cf6110..7e65efd1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java +++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java @@ -2,7 +2,6 @@ package it.integry.integrywmsnative; import android.app.Application; import android.os.Handler; -import android.os.Looper; import androidx.core.os.HandlerCompat; @@ -72,7 +71,7 @@ public class MainApplicationModule { @Provides @Singleton public Handler providesMainThreadHandler() { - return HandlerCompat.createAsync(Looper.getMainLooper()); + return HandlerCompat.createAsync(mApplication.getApplicationContext().getMainLooper()); } @Provides diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/InventarioRepository.java b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/InventarioRepository.java index a29c470e..bc3b8bbe 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/InventarioRepository.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/data_store/db/respository_new/InventarioRepository.java @@ -66,12 +66,15 @@ public class InventarioRepository extends _BaseRepository(); - resolveFetch(remoteData, internalLiveData.getValue(), + List finalRemoteData = remoteData; + + resolveFetch(finalRemoteData, internalLiveData.getValue(), (remoteItem, localItem) -> Objects.equals(remoteItem.getIdInventario(), localItem.getIdInventario()), (remoteItem, localItem) -> { remoteItem.setRemoteSyncDate(localItem.getRemoteSyncDate()); remoteItem.setNew(false); - }, onComplete, onError); + }, () -> handler.post(onComplete), ex -> handler.post(() -> onError.run(ex))); + } catch (Exception e) { onError.run(e); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java index 6c8cca76..9ee6fbbc 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java @@ -31,9 +31,9 @@ public class UtilityExceptions { public static void defaultException(Context context, Exception ex, boolean sendEmail) { if (ex.getMessage() != null) { - Logger.e(ex, Html.fromHtml(ex.getMessage()).toString()); + Logger.e(ex, Html.fromHtml(ex.getMessage()).toString(), ex.getStackTrace()); } else { - Logger.e(ex, "Errore"); + Logger.e(ex, "Errore", ex.getStackTrace()); } String errorMessage = CommonRESTException.tryRecognizeThenGetMessage(ex); 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 42e390e3..1832702d 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 @@ -95,6 +95,7 @@ public class SpedizioneViewModel { private Listener mListener; + private String mDefaultRagSocOfUL = null; private GestioneEnum mDefaultGestioneOfUL = null; private int mDefaultSegnoCol = -1; private String mDefaultCodMdep = null; @@ -205,6 +206,12 @@ public class SpedizioneViewModel { private void initDefaultVars() { if (this.mTestateOrdini != null && this.mTestateOrdini.size() > 0) { + List foundRagSoc = Stream.of(mTestateOrdini).map(OrdineUscitaInevasoDTO::getRagSocOrd).distinctBy(x -> x).toList(); + + if (foundRagSoc != null && foundRagSoc.size() == 1) { + mDefaultRagSocOfUL = foundRagSoc.get(0); + } + if (mDefaultGestioneOfUL == null) { //Definizione della gestione collo di default List foundGestioni = Stream.of(mTestateOrdini).map(OrdineUscitaInevasoDTO::getGestioneEnum).withoutNulls().distinct().toList(); @@ -1230,6 +1237,7 @@ public class SpedizioneViewModel { mMtbColtSessionID = this.mColliDataRecoverService.startNewSession(createdUDS, mTestateOrdini); this.mCurrentMtbColt = createdUDS; + this.mCurrentMtbColt.setRagSocCliente(mDefaultRagSocOfUL); this.mIsNewLU = true; if (onComplete != null) onComplete.run(); From 3c1471ee8d39191ea1d9181739906f182de81b52 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 16 Jun 2023 12:17:22 +0200 Subject: [PATCH 2/2] -> v1.34.01 (385) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3f1dc86f..410d339b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 384 - def appVersionName = '1.34.00' + def appVersionCode = 385 + def appVersionName = '1.34.01' signingConfigs { release {