From 7555e3d90f0bcfb70e1e68c7ed00bd98f187868c Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 7 Oct 2022 10:53:35 +0200 Subject: [PATCH 1/3] Rimossa troncatura dell'ITF-14 --- .../AccettazionePickingViewModel.java | 7 +------ .../gest/picking_libero/PickingLiberoViewModel.java | 10 ++-------- .../rettifica_giacenze/RettificaGiacenzeViewModel.java | 7 +------ .../gest/spedizione/SpedizioneViewModel.java | 7 +------ .../DialogChooseArtsFromListaArts.java | 7 +------ .../view/dialogs/scan_art/DialogScanArtViewModel.java | 9 ++------- 6 files changed, 8 insertions(+), 39 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java index 9d5f19df..d566b264 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java @@ -319,17 +319,12 @@ public class AccettazionePickingViewModel { } private void loadArticolo(String barcodeProd, PickDataDTO pickData, Runnable onComplete) { - if (barcodeProd.length() == 14) { - barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); - } - - String finalBarcodeProd = barcodeProd; this.mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> { if (mtbAartList != null && mtbAartList.size() > 0) { this.searchArtFromAnag(mtbAartList.get(0), pickData, onComplete); } else { - this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); + this.sendError(new NoResultFromBarcodeException(barcodeProd)); } }, this::sendError); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java index 99e069a2..9f09c888 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java @@ -200,12 +200,6 @@ public class PickingLiberoViewModel { } private void loadArticolo(String barcodeProd, Ean128Model ean128Model, Runnable onComplete) { - if (barcodeProd.length() == 14) { -// barcodeProd = UtilityBarcode.convertITF14toNeutral(barcodeProd); - barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); - } - - String finalBarcodeProd = barcodeProd; mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> { if (mtbAartList != null && mtbAartList.size() > 0) { MtbAart articolo = mtbAartList.get(0); @@ -217,11 +211,11 @@ public class PickingLiberoViewModel { this.dispatchArt(articolo, ean128Model); onComplete.run(); } else { - this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); + this.sendError(new NoResultFromBarcodeException(barcodeProd)); } } else { - this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); + this.sendError(new NoResultFromBarcodeException(barcodeProd)); } }, this::sendError); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java index b5d74961..d8b8d4f3 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java @@ -149,18 +149,13 @@ public class RettificaGiacenzeViewModel { } private void loadArticolo(String barcodeProd, PickDataDTO pickData, Runnable onComplete) { - if (barcodeProd.length() == 14) { - barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); - } - - String finalBarcodeProd = barcodeProd; this.mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> { if (onComplete != null) onComplete.run(); if (mtbAartList != null && mtbAartList.size() > 0) { this.dispatchArt(mtbAartList.get(0), pickData); } else { - this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); + this.sendError(new NoResultFromBarcodeException(barcodeProd)); } }, this::sendError); 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 5d7af861..5e71cc88 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 @@ -564,11 +564,6 @@ public class SpedizioneViewModel { } private void loadArticolo(String barcodeProd, PickDataDTO pickData, Runnable onComplete) { - if (barcodeProd.length() == 14) { - barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); - } - - String finalBarcodeProd = barcodeProd; this.mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> { if (mtbAartList != null && mtbAartList.size() > 0) { @@ -578,7 +573,7 @@ public class SpedizioneViewModel { mListener.onChooseArtRequest(mtbAartList, art -> this.searchArtFromAnag(art, pickData, onComplete)); } } else { - this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); + this.sendError(new NoResultFromBarcodeException(barcodeProd)); } }, this::sendError); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java index d42fe92a..660c3a81 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java @@ -308,15 +308,10 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment { private void loadArticolo(String barcodeProd, Ean128Model ean128Model) { - if (barcodeProd.length() == 14) { - barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); - } - - String finalBarcodeProd = barcodeProd; this.articoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> { if (mtbAartList != null && mtbAartList.size() > 0) { - this.mBindings.mainSearch.setQuery(finalBarcodeProd, false); + this.mBindings.mainSearch.setQuery(barcodeProd, false); this.searchArtInList(mtbAartList.get(0), ean128Model); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtViewModel.java index e36b8f0a..b0da913a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtViewModel.java @@ -149,11 +149,6 @@ public class DialogScanArtViewModel { private void loadArticolo(@NotNull String barcodeProd, Ean128Model ean128Model, RunnableArgssss> onComplete) { - if (barcodeProd.length() == 14) { - barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); - } - - String finalBarcodeProd = barcodeProd; this.mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> { if (mtbAartList != null && mtbAartList.size() > 0) { @@ -165,11 +160,11 @@ public class DialogScanArtViewModel { } else if (!mForceOnlyUL) { onComplete.run(DialogConsts.Results.YES, mtbAartList.get(0), ean128Model, null); } else { - this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); + this.sendError(new NoResultFromBarcodeException(barcodeProd)); } } else { - this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); + this.sendError(new NoResultFromBarcodeException(barcodeProd)); } }, this::sendError); } From b8b3d2f2bb2546deb8080d31892159731dbbd04c Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 7 Oct 2022 15:22:32 +0200 Subject: [PATCH 2/3] Implementato log su file --- app/build.gradle | 2 +- .../core/barcode_reader/BarcodeManager.java | 3 + .../core/context/AppContext.java | 14 ++- .../core/exception/ExceptionsHandler.java | 2 +- .../integrywmsnative/core/model/MtbColt.java | 2 +- .../core/model/MtbDepoPosizione.java | 3 +- .../rest/consumers/GestSetupRESTConsumer.java | 4 +- .../rest/consumers/OrdiniRESTConsumer.java | 4 +- .../PVOrdiniAcquistoRESTConsumer.java | 4 +- .../rest/consumers/PrinterRESTConsumer.java | 2 +- .../rest/consumers/SystemRESTConsumer.java | 2 +- .../core/utility/UtilityBarcode.java | 2 +- .../core/utility/UtilityDate.java | 2 +- .../core/utility/UtilityExceptions.java | 2 +- .../core/utility/UtilityLogger.java | 90 ++++++++++++------- .../rest/OrdiniAccettazioneRESTConsumer.java | 2 +- .../rest/AccettazionePickingRESTConsumer.java | 2 +- .../ProdOrdineProduzioneRESTConsumer.java | 2 +- .../RettificaGiacenzeViewModel.java | 1 - .../BottomSheetFragmentBaseView.java | 6 +- .../BottomSheetMtbColrEditView.java | 2 +- 21 files changed, 95 insertions(+), 58 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3ae1b17c..30c00528 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -94,7 +94,7 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' }) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'com.orhanobut:logger:2.2.0' + implementation 'com.github.lupaulus:logger:2.3.2' //Firebase diff --git a/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeManager.java b/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeManager.java index c473459b..5e986f50 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeManager.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeManager.java @@ -14,6 +14,7 @@ import java.util.List; import it.integry.barcode_base_android_library.interfaces.BarcodeReaderInterface; import it.integry.barcode_base_android_library.model.BarcodeSetting; import it.integry.honeywellscannerlibrary.HoneyWellBarcodeReader; +import it.integry.integrywmsnative.core.utility.UtilityLogger; import it.integry.integrywmsnative.gest.settings.MainSettingsFragment; import it.integry.keyobardemulatorscannerlibrary.KeyboardEmulatorBarcodeReader; import it.integry.pointmobilescannerlibrary.PointMobileBarcodeReader; @@ -135,10 +136,12 @@ public class BarcodeManager { public static void disable() { mEnabled = false; + UtilityLogger.trace("Barcode reader disabled"); } public static void enable() { mEnabled = true; + UtilityLogger.trace("Barcode reader enabled"); } public static boolean isEnabled() { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java b/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java index 1b05a43e..27a11b70 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java @@ -4,8 +4,11 @@ import android.content.Context; import com.google.firebase.crashlytics.FirebaseCrashlytics; import com.orhanobut.logger.AndroidLogAdapter; +import com.orhanobut.logger.DiskLogAdapter; import com.orhanobut.logger.Logger; +import java.io.File; + import javax.inject.Inject; import javax.inject.Singleton; @@ -36,8 +39,6 @@ public class AppContext { } - - @Inject public void init() { this.initUtilities(); @@ -56,10 +57,10 @@ public class AppContext { } private void initCrashlytics() { - if(!BuildConfig.DEBUG) { + if (!BuildConfig.DEBUG) { FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance(); - if( SettingsManager.isInstanceAvailable() && + if (SettingsManager.isInstanceAvailable() && (SettingsManager.i().getUserSession() != null && !UtilityString.isNullOrEmpty(SettingsManager.i().getUserSession().getProfileDB())) && (SettingsManager.i().getUser() != null && !UtilityString.isNullOrEmpty(SettingsManager.i().getUser().getFullname()))) { @@ -77,6 +78,11 @@ public class AppContext { private void initLogger() { Logger.addLogAdapter(new AndroidLogAdapter()); + + File logsFolder = new File(mApplicationContext.getExternalFilesDir(null).getAbsolutePath()); + int maxBytesSize = 5000; + Logger.addLogAdapter(new DiskLogAdapter(logsFolder, maxBytesSize)); + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/exception/ExceptionsHandler.java b/app/src/main/java/it/integry/integrywmsnative/core/exception/ExceptionsHandler.java index 58b4b6de..a6310fe4 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/exception/ExceptionsHandler.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/exception/ExceptionsHandler.java @@ -38,7 +38,7 @@ public class ExceptionsHandler implements Thread.UncaughtExceptionHandler { @Override public void uncaughtException(final Thread thread, final Throwable ex) { try { - UtilityLogger.errorMe(new Exception(ex)); + UtilityLogger.error(new Exception(ex)); } catch (Exception e) { Log.e(TAG, "Exception Logger failed!", e); MainApplication.exit(); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java index e46314e7..72cccd2c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColt.java @@ -175,7 +175,7 @@ public class MtbColt extends EntityBase { try { dataColloD = getDataColloD(); } catch (Exception ex) { - UtilityLogger.errorMe(ex); + UtilityLogger.error(ex); } if (dataColloD != null) { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbDepoPosizione.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbDepoPosizione.java index 2a9d3238..8b06a471 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbDepoPosizione.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbDepoPosizione.java @@ -1,6 +1,5 @@ package it.integry.integrywmsnative.core.model; -import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityLogger; public class MtbDepoPosizione { @@ -19,7 +18,7 @@ public class MtbDepoPosizione { return (MtbDepoPosizione) super.clone(); } catch (CloneNotSupportedException e) { e.printStackTrace(); - UtilityLogger.errorMe(e); + UtilityLogger.error(e); } return null; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumer.java index 0d498c1e..78ad94f1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GestSetupRESTConsumer.java @@ -61,7 +61,7 @@ public class GestSetupRESTConsumer extends _BaseRESTConsumer { @Override public void onFailure(Call> call, Throwable t) { Log.e("PrintCollo", t.toString()); - UtilityLogger.errorMe(new Exception(t)); + UtilityLogger.error(new Exception(t)); if (onFailed != null) onFailed.run(new Exception(t)); } }); @@ -88,7 +88,7 @@ public class GestSetupRESTConsumer extends _BaseRESTConsumer { @Override public void onFailure(Call>> call, Throwable t) { - UtilityLogger.errorMe(new Exception(t)); + UtilityLogger.error(new Exception(t)); if (onFailed != null) onFailed.run(new Exception(t)); } }); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java index 219ba5c5..1e620a2d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java @@ -109,7 +109,7 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer { @Override public void onFailure(Call>> call, Throwable t) { - UtilityLogger.errorMe(new Exception(t)); + UtilityLogger.error(new Exception(t)); onFailed.run(new Exception(t)); } }); @@ -174,7 +174,7 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer { @Override public void onFailure(Call>> call, Throwable t) { - UtilityLogger.errorMe(new Exception(t)); + UtilityLogger.error(new Exception(t)); onFailed.run(new Exception(t)); } }); 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 88a2dea9..33ddaf0d 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 @@ -79,7 +79,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer { @Override public void onFailure(Call> call, Throwable t) { Log.e("getArticoliListino_pv", t.toString()); - UtilityLogger.errorMe(new Exception(t)); + UtilityLogger.error(new Exception(t)); onFailed.run(new Exception(t)); } }); @@ -130,7 +130,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer { @Override public void onFailure(Call>> call, Throwable t) { Log.e("saveOrdineTerminale_pv", t.toString()); - UtilityLogger.errorMe(new Exception(t)); + UtilityLogger.error(new Exception(t)); onFailed.run(new Exception(t)); } }); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java index 1bb11bd7..62094468 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java @@ -51,7 +51,7 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer { @Override public void onFailure(Call>> call, Throwable t) { Log.e("GetAvailablePrinters", t.toString()); - UtilityLogger.errorMe(new Exception(t)); + UtilityLogger.error(new Exception(t)); onFailed.run(new Exception(t)); } }); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java index 71485bdf..8b0d8bd5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java @@ -115,7 +115,7 @@ public class SystemRESTConsumer extends _BaseRESTConsumer { public void onFailure(Call>> call, final Throwable t) { Log.e("ProfilesAvailable", t.toString()); onFailed.run(new Exception(t)); - UtilityLogger.errorMe(new Exception(t)); + UtilityLogger.error(new Exception(t)); } }); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java index ef97b9d6..f5efc173 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java @@ -130,7 +130,7 @@ public class UtilityBarcode { private static String getEAN13CheckDigit(String ean) { if (ean.length() != 12) { - UtilityLogger.errorMe(new Exception("Please provide an input string of 12 chars. Current lenght: " + ean.length())); + UtilityLogger.error(new Exception("Please provide an input string of 12 chars. Current lenght: " + ean.length())); return null; } long tot = 0; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java index 3897532f..5b7f01b3 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java @@ -37,7 +37,7 @@ public class UtilityDate { try{ return UtilityDate.recognizeDate(dateString); } catch (ParseException | DateNotRecognizedException | TimeNotRecognizedException pex){ - UtilityLogger.errorMe(pex); + UtilityLogger.error(pex); return null; } } 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 16151678..6c8cca76 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 @@ -61,7 +61,7 @@ public class UtilityExceptions { Stream.of(FIREBASE_IGNORED_EXCEPTIONS).anyMatch(x -> x.isAssignableFrom(ex.getClass())); if (!BuildConfig.DEBUG && !toIgnore) { - if (sendEmail) UtilityLogger.errorMe(ex); + if (sendEmail) UtilityLogger.error(ex); FirebaseCrashlytics.getInstance().recordException(ex); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java index 061befef..69373d0b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityLogger.java @@ -3,48 +3,30 @@ package it.integry.integrywmsnative.core.utility; import com.google.firebase.crashlytics.FirebaseCrashlytics; import com.orhanobut.logger.Logger; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.net.SocketException; -import java.net.SocketTimeoutException; - import it.integry.integrywmsnative.BuildConfig; -import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer; -import it.integry.integrywmsnative.core.expansion.RunnableArgs; -import it.integry.integrywmsnative.core.settings.SettingsManager; public class UtilityLogger { - public static void logMe(String message) { - StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace(); + public static void trace(String message) { + Logger.d(message, getPreviousStackTraceElement()); + } - String caller = "UtilityLogger"; - - for (int i = 0; i < stackTraceElements.length; i++) { - - if (stackTraceElements[i].getMethodName().equalsIgnoreCase("logMe")) { - caller = stackTraceElements[i + 1].getFileName() + "->" + stackTraceElements[i + 1].getMethodName(); - } - - } + public static void info(String message) { + Logger.i(message); + } + public static void debug(String message) { Logger.d(message); } - public static void errorMe(Exception ex) { - errorMe(ex, null, null, null); + public static void error(Exception ex) { + error(ex, ""); } - public static void errorMe(Exception ex, String additionalText) { - errorMe(ex, additionalText, null, null); - } + public static void error(Exception ex, String additionalText) { + if (!BuildConfig.DEBUG) FirebaseCrashlytics.getInstance().recordException(ex); - public static void errorMe(Exception ex, String additionalText, Runnable onComplete, RunnableArgs onFailed) { - if(!BuildConfig.DEBUG) FirebaseCrashlytics.getInstance().recordException(ex); - - logMe(ex.getMessage()); + Logger.e(ex, additionalText); // if ((!(ex instanceof SocketTimeoutException) && !(ex.getCause() instanceof SocketTimeoutException)) || // (!(ex instanceof SocketException) && !(ex.getCause() instanceof SocketException)) || @@ -82,4 +64,52 @@ public class UtilityLogger { // } } + private static String getPreviousStackTraceElement() { + StackTraceElement[] stackTraceElementsArr = Thread.currentThread().getStackTrace(); + String caller = "UtilityLogger"; + StringBuilder callerNew = new StringBuilder(); + + int found = 0; + + for (int i = 0; i < stackTraceElementsArr.length; i++) { + + if(!stackTraceElementsArr[i].getClassName().startsWith("it.integry")) + continue; + + if (stackTraceElementsArr[i].getMethodName().equalsIgnoreCase("getPreviousStackTraceElement")) { + found = i; + } + + if (found > 0 && i >= found + 2) { + callerNew + .append(stackTraceElementsArr[i].getClassName()) + .append("->") + .append(stackTraceElementsArr[i].getMethodName()) + .append(":") + .append(stackTraceElementsArr[i].getLineNumber()) + .append("\n"); + } + + } + + return callerNew.length() > 0 ? callerNew.toString() : caller; + } + + +// public static void logMe(String message) { +// StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace(); +// +// String caller = "UtilityLogger"; +// +// for (int i = 0; i < stackTraceElements.length; i++) { +// +// if (stackTraceElements[i].getMethodName().equalsIgnoreCase("logMe")) { +// caller = stackTraceElements[i + 1].getFileName() + "->" + stackTraceElements[i + 1].getMethodName(); +// } +// +// } +// +// Logger.d(message); +// } + } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/rest/OrdiniAccettazioneRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/rest/OrdiniAccettazioneRESTConsumer.java index 08561633..990cd16c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/rest/OrdiniAccettazioneRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/rest/OrdiniAccettazioneRESTConsumer.java @@ -55,7 +55,7 @@ public class OrdiniAccettazioneRESTConsumer extends _BaseRESTConsumer { @Override public void onFailure(Call>> call, Throwable t) { - UtilityLogger.errorMe(new Exception(t)); + UtilityLogger.error(new Exception(t)); onFailed.run(new Exception(t)); } }); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/rest/AccettazionePickingRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/rest/AccettazionePickingRESTConsumer.java index 44a9265d..39b3bf5d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/rest/AccettazionePickingRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/rest/AccettazionePickingRESTConsumer.java @@ -43,7 +43,7 @@ public class AccettazionePickingRESTConsumer { whereCondListMap.add(whereCondMap); } catch (Exception ex) { - UtilityLogger.errorMe(ex); + UtilityLogger.error(ex); } }); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/rest/ProdOrdineProduzioneRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/rest/ProdOrdineProduzioneRESTConsumer.java index 105ea499..e2af9842 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/rest/ProdOrdineProduzioneRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/rest/ProdOrdineProduzioneRESTConsumer.java @@ -55,7 +55,7 @@ public class ProdOrdineProduzioneRESTConsumer extends _BaseRESTConsumer { @Override public void onFailure(Call>> call, Throwable t) { - UtilityLogger.errorMe(new Exception(t)); + UtilityLogger.error(new Exception(t)); onFailed.run(new Exception(t)); } }); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java index b5d74961..46544cf0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java @@ -77,7 +77,6 @@ public class RettificaGiacenzeViewModel { this.mDefaultCausale = defaultCausale; this.mCurrentCodMdep = currentCodMdep; - this.sendOnLoadingStarted(); this.mRettificaGiacenzeRESTConsumer.loadListaFornitori(fornitori -> { diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__base/BottomSheetFragmentBaseView.java b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__base/BottomSheetFragmentBaseView.java index 9e878e01..7720e652 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__base/BottomSheetFragmentBaseView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__base/BottomSheetFragmentBaseView.java @@ -64,7 +64,7 @@ public abstract class BottomSheetFragmentBaseView extends ConstraintLayout { public void expand() { if(this.mBottomSheetBehavior == null) { - UtilityLogger.errorMe(new BottomSheetFragmentViewNotInitializedException()); + UtilityLogger.error(new BottomSheetFragmentViewNotInitializedException()); return; } @@ -73,7 +73,7 @@ public abstract class BottomSheetFragmentBaseView extends ConstraintLayout { public void collapse() { if(this.mBottomSheetBehavior == null) { - UtilityLogger.errorMe(new BottomSheetFragmentViewNotInitializedException()); + UtilityLogger.error(new BottomSheetFragmentViewNotInitializedException()); return; } @@ -91,7 +91,7 @@ public abstract class BottomSheetFragmentBaseView extends ConstraintLayout { public State getState() { if(this.mBottomSheetBehavior == null) { - UtilityLogger.errorMe(new BottomSheetFragmentViewNotInitializedException()); + UtilityLogger.error(new BottomSheetFragmentViewNotInitializedException()); return null; } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__mtb_colr_edit/BottomSheetMtbColrEditView.java b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__mtb_colr_edit/BottomSheetMtbColrEditView.java index 28aa387c..ef02a59a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__mtb_colr_edit/BottomSheetMtbColrEditView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__mtb_colr_edit/BottomSheetMtbColrEditView.java @@ -61,7 +61,7 @@ public class BottomSheetMtbColrEditView extends BottomSheetFragmentBaseView { @Override public void expand() { if(this.mViewModel.getMtbColr() == null) { - UtilityLogger.errorMe(new NullMtbColrException()); + UtilityLogger.error(new NullMtbColrException()); return; } From 7163d91c531454fb8f0ba4568bb9f02ba5430c24 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 7 Oct 2022 15:22:43 +0200 Subject: [PATCH 3/3] Revert "Rimossa troncatura dell'ITF-14" This reverts commit 7555e3d90f0bcfb70e1e68c7ed00bd98f187868c. --- .../AccettazionePickingViewModel.java | 7 ++++++- .../gest/picking_libero/PickingLiberoViewModel.java | 10 ++++++++-- .../rettifica_giacenze/RettificaGiacenzeViewModel.java | 7 ++++++- .../gest/spedizione/SpedizioneViewModel.java | 7 ++++++- .../DialogChooseArtsFromListaArts.java | 7 ++++++- .../view/dialogs/scan_art/DialogScanArtViewModel.java | 9 +++++++-- 6 files changed, 39 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java index d566b264..9d5f19df 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java @@ -319,12 +319,17 @@ public class AccettazionePickingViewModel { } private void loadArticolo(String barcodeProd, PickDataDTO pickData, Runnable onComplete) { + if (barcodeProd.length() == 14) { + barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); + } + + String finalBarcodeProd = barcodeProd; this.mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> { if (mtbAartList != null && mtbAartList.size() > 0) { this.searchArtFromAnag(mtbAartList.get(0), pickData, onComplete); } else { - this.sendError(new NoResultFromBarcodeException(barcodeProd)); + this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); } }, this::sendError); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java index 9f09c888..99e069a2 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoViewModel.java @@ -200,6 +200,12 @@ public class PickingLiberoViewModel { } private void loadArticolo(String barcodeProd, Ean128Model ean128Model, Runnable onComplete) { + if (barcodeProd.length() == 14) { +// barcodeProd = UtilityBarcode.convertITF14toNeutral(barcodeProd); + barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); + } + + String finalBarcodeProd = barcodeProd; mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> { if (mtbAartList != null && mtbAartList.size() > 0) { MtbAart articolo = mtbAartList.get(0); @@ -211,11 +217,11 @@ public class PickingLiberoViewModel { this.dispatchArt(articolo, ean128Model); onComplete.run(); } else { - this.sendError(new NoResultFromBarcodeException(barcodeProd)); + this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); } } else { - this.sendError(new NoResultFromBarcodeException(barcodeProd)); + this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); } }, this::sendError); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java index d8b8d4f3..b5d74961 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java @@ -149,13 +149,18 @@ public class RettificaGiacenzeViewModel { } private void loadArticolo(String barcodeProd, PickDataDTO pickData, Runnable onComplete) { + if (barcodeProd.length() == 14) { + barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); + } + + String finalBarcodeProd = barcodeProd; this.mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> { if (onComplete != null) onComplete.run(); if (mtbAartList != null && mtbAartList.size() > 0) { this.dispatchArt(mtbAartList.get(0), pickData); } else { - this.sendError(new NoResultFromBarcodeException(barcodeProd)); + this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); } }, this::sendError); 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 5e71cc88..5d7af861 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 @@ -564,6 +564,11 @@ public class SpedizioneViewModel { } private void loadArticolo(String barcodeProd, PickDataDTO pickData, Runnable onComplete) { + if (barcodeProd.length() == 14) { + barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); + } + + String finalBarcodeProd = barcodeProd; this.mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> { if (mtbAartList != null && mtbAartList.size() > 0) { @@ -573,7 +578,7 @@ public class SpedizioneViewModel { mListener.onChooseArtRequest(mtbAartList, art -> this.searchArtFromAnag(art, pickData, onComplete)); } } else { - this.sendError(new NoResultFromBarcodeException(barcodeProd)); + this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); } }, this::sendError); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java index 660c3a81..d42fe92a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java @@ -308,10 +308,15 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment { private void loadArticolo(String barcodeProd, Ean128Model ean128Model) { + if (barcodeProd.length() == 14) { + barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); + } + + String finalBarcodeProd = barcodeProd; this.articoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> { if (mtbAartList != null && mtbAartList.size() > 0) { - this.mBindings.mainSearch.setQuery(barcodeProd, false); + this.mBindings.mainSearch.setQuery(finalBarcodeProd, false); this.searchArtInList(mtbAartList.get(0), ean128Model); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtViewModel.java index b0da913a..e36b8f0a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtViewModel.java @@ -149,6 +149,11 @@ public class DialogScanArtViewModel { private void loadArticolo(@NotNull String barcodeProd, Ean128Model ean128Model, RunnableArgssss> onComplete) { + if (barcodeProd.length() == 14) { + barcodeProd = UtilityBarcode.convertITF14toEAN13(barcodeProd); + } + + String finalBarcodeProd = barcodeProd; this.mArticoloRESTConsumer.getByBarcodeProd(barcodeProd, mtbAartList -> { if (mtbAartList != null && mtbAartList.size() > 0) { @@ -160,11 +165,11 @@ public class DialogScanArtViewModel { } else if (!mForceOnlyUL) { onComplete.run(DialogConsts.Results.YES, mtbAartList.get(0), ean128Model, null); } else { - this.sendError(new NoResultFromBarcodeException(barcodeProd)); + this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); } } else { - this.sendError(new NoResultFromBarcodeException(barcodeProd)); + this.sendError(new NoResultFromBarcodeException(finalBarcodeProd)); } }, this::sendError); }