From 4aab6b1688fb725630a8d90bada776a89ac66a8f Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 24 Mar 2022 12:40:15 +0100 Subject: [PATCH] Ottimizzazioni su DialogProgress --- .../MainApplicationComponent.java | 5 + .../core/expansion/BaseActivity.java | 82 ++++++++-------- .../core/expansion/BaseDialogFragment.java | 96 ++++++++++--------- .../BaseDialogFragmentComponent.java | 14 +++ .../expansion/BaseDialogFragmentModule.java | 7 ++ .../core/expansion/BaseFragment.java | 43 +++++---- .../consumers/ColliMagazzinoRESTConsumer.java | 54 ++++++----- .../core/utility/UtilityProgress.java | 6 -- .../AccettazionePickingActivity.java | 26 ++--- .../OrdiniUscitaElencoFragment.java | 17 +--- .../picking_libero/PickingLiberoFragment.java | 12 +-- .../picking_resi/PickingResiActivity.java | 30 ++---- .../ProdFabbisognoLineeProdFragment.java | 19 ---- .../DialogAskMagazzinoProssimitaView.java | 18 ---- .../ProdRecuperoMaterialeFragment.java | 6 +- .../ProdRientroMerceOrderDetailFragment.java | 46 ++++----- .../ProdVersamentoMaterialeFragment.java | 2 +- .../RettificaGiacenzeFragment.java | 15 ++- .../gest/spedizione/SpedizioneActivity.java | 29 ++---- .../UltimeConsegneClienteFragment.java | 20 +--- .../UltimiArriviFornitoreFragment.java | 21 +--- .../VersamentoMerceFragment.java | 8 +- .../VersamentoMerceViewModel.java | 43 ++++----- .../DialogChooseArtsFromListaArts.java | 31 ++---- .../DialogInputQuantityV2View.java | 6 +- .../dialogs/scan_art/DialogScanArtView.java | 6 +- .../DialogScanOrCreateLUView.java | 27 +----- 27 files changed, 269 insertions(+), 420 deletions(-) create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragmentComponent.java create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragmentModule.java diff --git a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java index fe6f998e..0557c19c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java +++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java @@ -7,6 +7,8 @@ import it.integry.integrywmsnative.core.context.AppContext; import it.integry.integrywmsnative.core.data_store.db.RoomModule; import it.integry.integrywmsnative.core.expansion.BaseActivityComponent; import it.integry.integrywmsnative.core.expansion.BaseActivityModule; +import it.integry.integrywmsnative.core.expansion.BaseDialogFragmentComponent; +import it.integry.integrywmsnative.core.expansion.BaseDialogFragmentModule; import it.integry.integrywmsnative.core.expansion.BaseFragmentComponent; import it.integry.integrywmsnative.core.expansion.BaseFragmentModule; import it.integry.integrywmsnative.gest.accettazione.MainAccettazioneComponent; @@ -91,6 +93,7 @@ import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCr MainApplicationModule.class, BaseActivityModule.class, BaseFragmentModule.class, + BaseDialogFragmentModule.class, LoginModule.class, MainActivityModule.class, MainFragmentModule.class, @@ -133,6 +136,8 @@ public interface MainApplicationComponent { BaseFragmentComponent.Factory baseFragmentComponent(); + BaseDialogFragmentComponent.Factory baseDialogFragmentComponent(); + SplashActivityComponent.Factory splashActivityComponent(); LoginComponent.Factory loginActivityComponent(); 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 dee65413..3492a787 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 @@ -36,6 +36,45 @@ public class BaseActivity extends AppCompatActivity { return v; } + public void onLoadingStarted() { + BarcodeManager.disable(); + this.openProgress(); + } + + public void onLoadingEnded() { + this.closeProgress(); + BarcodeManager.enable(); + } + + public void onError(Exception ex) { + this.runOnUiThread(() -> { + this.closeProgress(); + UtilityExceptions.defaultException(this, ex, mCurrentProgress); + BarcodeManager.enable(); + }); + } + + + private void openProgress() { + BarcodeManager.disable(); + if (!progressOpened && !this.mCurrentProgress.isAdded()) { + this.progressOpened = true; + runOnUiThread(() -> { + this.mCurrentProgress.show(getSupportFragmentManager(), "tag"); + }); + } + } + + private void closeProgress() { + BarcodeManager.enable(); + if (progressOpened) { + this.progressOpened = false; + runOnUiThread(() -> { + mCurrentProgress.dismiss(); + }); + } + } + @Override public boolean dispatchKeyEvent(KeyEvent event) { if (BarcodeManager.isEnabled() && BarcodeManager.isKeyboardEmulator()) { @@ -56,47 +95,4 @@ public class BaseActivity extends AppCompatActivity { ); } - - protected void openProgress() { - BarcodeManager.disable(); - if (!progressOpened && !this.mCurrentProgress.isAdded()) { - this.progressOpened = true; - runOnUiThread(() -> { - this.mCurrentProgress.show(getSupportFragmentManager(), "tag"); - }); - } - } - - protected void closeProgress() { - BarcodeManager.enable(); - if (progressOpened) { - this.progressOpened = false; - runOnUiThread(() -> { - mCurrentProgress.dismiss(); - }); - } - } - - - public void onLoadingStarted() { -// new Thread(() -> { - BarcodeManager.disable(); - this.openProgress(); -// }).start(); - } - - public void onLoadingEnded() { -// new Thread(() -> { - this.closeProgress(); - BarcodeManager.enable(); -// }).start(); - } - - public void onError(Exception ex) { - this.runOnUiThread(() -> { - this.closeProgress(); - UtilityExceptions.defaultException(this, ex, mCurrentProgress); - BarcodeManager.enable(); - }); - } } 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 5b932074..9e893a49 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 @@ -11,19 +11,21 @@ import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; +import javax.inject.Inject; + +import it.integry.integrywmsnative.MainApplication; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.utility.UtilityExceptions; -import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.view.dialogs.DialogProgressView; public class BaseDialogFragment extends DialogFragment { - private boolean mBarcodeListener = false; - private DialogProgressView mCurrentProgress; + @Inject + public DialogProgressView mCurrentProgress; + private boolean progressOpened; + + private boolean mBarcodeListener = false; - public BaseDialogFragment() { - super(); - } @Override @@ -41,6 +43,11 @@ public class BaseDialogFragment extends DialogFragment { public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); + MainApplication.appComponent + .baseDialogFragmentComponent() + .create() + .inject(this); + if (BarcodeManager.isEnabled() && BarcodeManager.isKeyboardEmulator()) { getDialog().setOnKeyListener((dialog, keyCode, event) -> { if (mBarcodeListener && (event.getAction() == KeyEvent.ACTION_DOWN || event.getAction() == KeyEvent.ACTION_MULTIPLE) && !isControlKey(event)) { @@ -51,6 +58,42 @@ public class BaseDialogFragment extends DialogFragment { } } + public void onLoadingStarted() { + BarcodeManager.disable(); + this.openProgress(); + } + + public void onLoadingEnded() { + this.closeProgress(); + BarcodeManager.enable(); + } + + private void openProgress() { + if (!progressOpened && !this.mCurrentProgress.isAdded()) { + this.progressOpened = true; + requireActivity().runOnUiThread(() -> { + this.mCurrentProgress.show(requireActivity().getSupportFragmentManager(), "tag"); + }); + } + } + + private void closeProgress() { + if (progressOpened) { + this.progressOpened = false; + requireActivity().runOnUiThread(() -> { + mCurrentProgress.dismiss(); + }); + } + } + + + public void onError(Exception ex) { + requireActivity().runOnUiThread(() -> { + this.onLoadingEnded(); + UtilityExceptions.defaultException(requireActivity(), ex); + }); + } + private boolean isControlKey(KeyEvent keyEvent) { int keyCode = keyEvent.getKeyCode(); return ( @@ -65,45 +108,4 @@ public class BaseDialogFragment extends DialogFragment { } - - - public void onLoadingStarted() { - BarcodeManager.disable(); - this.openProgress(); - } - - public void onLoadingEnded() { - this.closeProgress(); - BarcodeManager.enable(); - } - - protected void openProgress() { - -// new Thread(() -> { - requireActivity().runOnUiThread(() -> { - if (this.mCurrentProgress == null) { - this.mCurrentProgress = UtilityProgress.createDefaultProgressDialog(requireActivity()); - } - }); -// }).start(); - } - - protected void closeProgress() { -// new Thread(() -> { - requireActivity().runOnUiThread(() -> { - if (mCurrentProgress != null) { - mCurrentProgress.dismiss(); - mCurrentProgress = null; - } - }); -// }).start(); - } - - - public void onError(Exception ex) { - requireActivity().runOnUiThread(() -> { - this.closeProgress(); - UtilityExceptions.defaultException(requireActivity(), ex); - }); - } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragmentComponent.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragmentComponent.java new file mode 100644 index 00000000..17e7d462 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragmentComponent.java @@ -0,0 +1,14 @@ +package it.integry.integrywmsnative.core.expansion; + +import dagger.Subcomponent; + +@Subcomponent +public interface BaseDialogFragmentComponent { + + @Subcomponent.Factory + interface Factory { + BaseDialogFragmentComponent create(); + } + + void inject(BaseDialogFragment baseDialogFragment); +} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragmentModule.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragmentModule.java new file mode 100644 index 00000000..94743e4b --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialogFragmentModule.java @@ -0,0 +1,7 @@ +package it.integry.integrywmsnative.core.expansion; + +import dagger.Module; + +@Module(subcomponents = BaseDialogFragmentComponent.class) +public class BaseDialogFragmentModule { +} 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 1b9213e6..2cc2d837 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 @@ -1,6 +1,7 @@ package it.integry.integrywmsnative.core.expansion; import android.os.Bundle; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -63,6 +64,30 @@ public abstract class BaseFragment extends Fragment { BarcodeManager.enable(); } + private void openProgress() { + Log.d("PROGRESS DIALOG", "OPENED"); + new Thread(() -> { + if (!progressOpened && !this.mCurrentProgress.isAdded()) { + this.progressOpened = true; + requireActivity().runOnUiThread(() -> { + this.mCurrentProgress.show(requireActivity().getSupportFragmentManager(), "tag"); + }); + } + }).start(); + } + + private void closeProgress() { + Log.d("PROGRESS DIALOG", "CLOSED"); + new Thread(() -> { + if (progressOpened) { + this.progressOpened = false; + requireActivity().runOnUiThread(() -> { + mCurrentProgress.dismiss(); + }); + } + }).start(); + } + public void onError(Exception ex) { requireActivity().runOnUiThread(() -> { this.closeProgress(); @@ -81,24 +106,6 @@ public abstract class BaseFragment extends Fragment { } } - protected void openProgress() { - if (!progressOpened) { - this.progressOpened = true; - requireActivity().runOnUiThread(() -> { - this.mCurrentProgress.show(requireActivity().getSupportFragmentManager(), "tag"); - }); - } - } - - protected void closeProgress() { - if (progressOpened) { - this.progressOpened = false; - requireActivity().runOnUiThread(() -> { - mCurrentProgress.dismiss(); - }); - } - } - protected void popMe() { requireActivity().runOnUiThread(() -> { ((IPoppableActivity) requireActivity()).pop(); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java index a22cc23a..57639835 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/ColliMagazzinoRESTConsumer.java @@ -582,35 +582,37 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer { } public void spostaArtsTraUL(MtbColt sourceMtbColt, MtbColt destMtbColt, Runnable onComplete, RunnableArgs onFailed) { - MtbColt mtbColtToMoveClone = (MtbColt) sourceMtbColt.clone(); - MtbColt mtbColtDestClone = (MtbColt) destMtbColt.clone(); + new Thread(() -> { + MtbColt mtbColtToMoveClone = (MtbColt) sourceMtbColt.clone(); + MtbColt mtbColtDestClone = (MtbColt) destMtbColt.clone(); - for (int i = 0; i < mtbColtToMoveClone.getMtbColr().size(); i++) { - mtbColtToMoveClone.getMtbColr().get(i) - .setMtbAart(null) - .setMtbPartitaMag(null); - } - - mtbColtDestClone.setMtbColr(null); - - SpostaArtsTraULRequestDTO spostaArtsTraULRequestDTO = new SpostaArtsTraULRequestDTO() - .setSourceMtbColt(mtbColtToMoveClone) - .setDestinationMtbColt(mtbColtDestClone); - - ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class); - colliMagazzinoRESTConsumerService.spostaArtsTraUL(spostaArtsTraULRequestDTO).enqueue(new Callback<>() { - @Override - public void onResponse(Call> call, Response> response) { - analyzeAnswer(response, "spostaArtsTraUL", data -> { - onComplete.run(); - }, onFailed); + for (int i = 0; i < mtbColtToMoveClone.getMtbColr().size(); i++) { + mtbColtToMoveClone.getMtbColr().get(i) + .setMtbAart(null) + .setMtbPartitaMag(null); } - @Override - public void onFailure(Call> call, Throwable t) { - if (onFailed != null) onFailed.run(new Exception(t)); - } - }); + mtbColtDestClone.setMtbColr(null); + + SpostaArtsTraULRequestDTO spostaArtsTraULRequestDTO = new SpostaArtsTraULRequestDTO() + .setSourceMtbColt(mtbColtToMoveClone) + .setDestinationMtbColt(mtbColtDestClone); + + ColliMagazzinoRESTConsumerService colliMagazzinoRESTConsumerService = RESTBuilder.getService(ColliMagazzinoRESTConsumerService.class); + colliMagazzinoRESTConsumerService.spostaArtsTraUL(spostaArtsTraULRequestDTO).enqueue(new Callback<>() { + @Override + public void onResponse(Call> call, Response> response) { + analyzeAnswer(response, "spostaArtsTraUL", data -> { + onComplete.run(); + }, onFailed); + } + + @Override + public void onFailure(Call> call, Throwable t) { + if (onFailed != null) onFailed.run(new Exception(t)); + } + }); + }).start(); } public void assegnaLottoSuColloScarico(MtbColt sourceMtbColt, Runnable onComplete, RunnableArgs onFailed) { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityProgress.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityProgress.java index 17887c96..e59ad18b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityProgress.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityProgress.java @@ -1,6 +1,5 @@ package it.integry.integrywmsnative.core.utility; -import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.FragmentActivity; import it.integry.integrywmsnative.view.dialogs.DialogProgressView; @@ -13,10 +12,5 @@ public class UtilityProgress { return progress; } - public static DialogProgressView createDefaultProgressDialog(AppCompatActivity mContext, String title, String subtitle) { - DialogProgressView progress = DialogProgressView.newInstance(title, subtitle, true); - progress.show(mContext.getSupportFragmentManager(), "tag"); - return progress; - } } 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 eccb6cb4..6bf1e31b 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 @@ -688,13 +688,10 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta } private final RunnableArgs onScanSuccessful = data -> { - BarcodeManager.disable(); - - this.openProgress(); + this.onLoadingStarted(); this.mViewModel.processBarcodeDTO(data, () -> { - BarcodeManager.enable(); - this.closeProgress(); + this.onLoadingEnded(); }); }; @@ -705,11 +702,10 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta public void createNewLU() { this.mBindings.accettazioneOrdineInevasoFab.close(true); - - this.openProgress(); + this.onLoadingStarted(); this.mViewModel.createNewLU(null, null, false, () -> { - this.closeProgress(); + this.onLoadingEnded(); }); } @@ -756,7 +752,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta @Override public void onLUPrintError(Exception ex, Runnable onComplete) { - this.closeProgress(); + this.onLoadingEnded(); DialogSimpleMessageView.makeErrorDialog( new SpannableString(ex.getMessage()), null, @@ -766,16 +762,6 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta .show(getSupportFragmentManager(), "tag"); } - @Override - public void onLoadingStarted() { - this.openProgress(); - } - - @Override - public void onLoadingEnded() { - this.closeProgress(); - } - @Override public void onMtbColrEdit(MtbColr mtbColr) { this.mViewModel.dispatchRowEdit(mtbColr); @@ -808,7 +794,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta @Override public void onError(Exception ex) { - this.closeProgress(); + this.onLoadingEnded(); if (ex instanceof InvalidPesoKGException) { UtilityToast.showToast(ex.getMessage()); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java index 1c0dfdcb..4fc42368 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java @@ -687,21 +687,14 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF private final RunnableArgs onScanSuccessful = data -> { - BarcodeManager.disable(); - this.openProgress(); + this.onLoadingStarted(); this.mViewModel.processBarcodeDTO(data, () -> { - BarcodeManager.enable(); - this.closeProgress(); + this.onLoadingEnded(); }); }; private void refreshList(List filteredList) { - -// new Thread(() -> { - -// requireActivity().runOnUiThread(() -> { -// this.onLoadingStarted(); List tmpList; if (filteredList != null) { @@ -720,12 +713,6 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF fabVisible.set(Stream.of(mOrdiniInevasiMutableData) .anyMatch(y -> y.getSelectedObservable().get())); - -// this.onLoadingEnded(); -// }); - -// }).start(); - } private List convertDataModelToListModel(List dataList) { 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 a62b7ba0..faaf9de9 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 @@ -266,13 +266,13 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme null, () -> onComplete.run(true), () -> onComplete.run(false) - ).show(getActivity().getSupportFragmentManager(), "tag"); + ).show(requireActivity().getSupportFragmentManager(), "tag"); } @Override public void onError(Exception ex) { - getActivity().runOnUiThread(() -> { - this.closeProgress(); + requireActivity().runOnUiThread(() -> { + this.onLoadingEnded(); if (ex instanceof InvalidPesoKGException) { UtilityToast.showToast(ex.getMessage()); @@ -287,7 +287,7 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme @Override public void onLUClienteRequired(RunnableArgss onComplete, Runnable onAbort) { DialogAskClienteView.newInstance(onComplete, onAbort) - .show(getActivity().getSupportFragmentManager(), "tag"); + .show(requireActivity().getSupportFragmentManager(), "tag"); } @Override @@ -346,10 +346,10 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme .setPartitaMag(resultDTO.getPartitaMag()) .setDataScad(resultDTO.getDataScad()); - this.openProgress(); + this.onLoadingStarted(); onComplete.run(pickedQuantityDTO, shouldCloseLU); }) - .setOnAbort(this::closeProgress) + .setOnAbort(this::onLoadingEnded) .show(requireActivity().getSupportFragmentManager(), "tag"); } 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 cfa358d5..613fe2fe 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 @@ -239,24 +239,20 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag return pickingResiListModels; } - private RunnableArgs onScanSuccessful = data -> { - BarcodeManager.disable(); - - this.openProgress(); + private final RunnableArgs onScanSuccessful = data -> { + this.onLoadingStarted(); this.mViewmodel.processBarcodeDTO(data, () -> { - BarcodeManager.enable(); - this.closeProgress(); + this.onLoadingEnded(); }); }; public void createNewLU() { this.mBindings.mainFab.close(true); - - this.openProgress(); + this.onLoadingStarted(); this.mViewmodel.createNewLU(null, null, () -> { - this.closeProgress(); + this.onLoadingEnded(); }); } @@ -286,7 +282,7 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag @Override public void onError(Exception ex) { - this.closeProgress(); + this.onLoadingEnded(); if (ex instanceof InvalidPesoKGException) { UtilityToast.showToast(ex.getMessage()); @@ -332,7 +328,7 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag .setPartitaMag(resultDTO.getPartitaMag()) .setDataScad(resultDTO.getDataScad()); - this.openProgress(); + this.onLoadingStarted(); onComplete.run(pickedQuantityDTO, shouldCloseLU); }) .setOnAbort(() -> { @@ -400,7 +396,7 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag @Override public void onLUPrintError(Exception ex, Runnable onComplete) { - this.closeProgress(); + this.onLoadingEnded(); DialogSimpleMessageView.makeErrorDialog( new SpannableString(ex.getMessage()), null, @@ -409,14 +405,4 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag onComplete) .show(getSupportFragmentManager(), "tag"); } - - @Override - public void onLoadingStarted() { - this.openProgress(); - } - - @Override - public void onLoadingEnded() { - this.closeProgress(); - } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java index ed2b8857..999fa4f7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/ProdFabbisognoLineeProdFragment.java @@ -26,7 +26,6 @@ import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.rest.model.SitArtOrdDTO; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityBigDecimal; -import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.databinding.FragmentProdFabbisognoLineeProdBinding; import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dialog_ask_mag_prossimita.DialogAskMagazzinoProssimitaView; import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeProdDTO; @@ -112,24 +111,6 @@ public class ProdFabbisognoLineeProdFragment extends BaseFragment implements ITi titleText.setText(context.getText(R.string.prod_fabbisogno_linee_prod_title).toString()); } - - @Override - public void onError(Exception ex) { - this.closeProgress(); - UtilityExceptions.defaultException(getActivity(), ex); - } - - @Override - public void onLoadingStarted() { - this.openProgress(); - } - - @Override - public void onLoadingEnded() { - this.closeProgress(); - } - - private void startPickingActivity(List fabbisognoList) { String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dialog_ask_mag_prossimita/DialogAskMagazzinoProssimitaView.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dialog_ask_mag_prossimita/DialogAskMagazzinoProssimitaView.java index 18af86f3..47a04a68 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dialog_ask_mag_prossimita/DialogAskMagazzinoProssimitaView.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/dialog_ask_mag_prossimita/DialogAskMagazzinoProssimitaView.java @@ -22,14 +22,12 @@ import javax.inject.Inject; import it.integry.integrywmsnative.MainApplication; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.BaseDialogFragment; import it.integry.integrywmsnative.core.expansion.OnSingleClickListener; import it.integry.integrywmsnative.core.expansion.RunnableArgsss; import it.integry.integrywmsnative.core.model.JtbFasi; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityDate; -import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.databinding.DialogAskMagazzinoProssimitaBinding; public class DialogAskMagazzinoProssimitaView extends BaseDialogFragment implements DialogAskMagazzinoProssimitaViewModel.Listener { @@ -178,20 +176,4 @@ public class DialogAskMagazzinoProssimitaView extends BaseDialogFragment impleme // }); // } - @Override - public void onError(Exception ex) { - this.closeProgress(); - UtilityExceptions.defaultException(mContext, ex); - BarcodeManager.enable(); - } - - @Override - public void onLoadingStarted() { - this.openProgress(); - } - - @Override - public void onLoadingEnded() { - this.closeProgress(); - } } 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 a3d8a7b0..7f5effd2 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 @@ -116,9 +116,7 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl } private final RunnableArgs onScanSuccessful = data -> { - BarcodeManager.disable(); - - this.openProgress(); + this.onLoadingStarted(); this.mViewModel.processBarcodeDTO(data); }; @@ -228,7 +226,7 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl @Override public void onLUPrintError(Exception ex, Runnable onComplete) { - this.closeProgress(); + this.onLoadingEnded(); DialogSimpleMessageView.makeErrorDialog( new SpannableString(ex.getMessage()), null, diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java index 916af520..80329f6d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java @@ -110,10 +110,10 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements private void initRecyclerView() { mBindings.mainList.setNestedScrollingEnabled(false); mBindings.mainList.setHasFixedSize(true); - mBindings.mainList.setLayoutManager(new LinearLayoutManager(getActivity())); + mBindings.mainList.setLayoutManager(new LinearLayoutManager(requireActivity())); - SimpleDividerItemDecoration itemDecorator = new SimpleDividerItemDecoration(getActivity(), SimpleDividerItemDecoration.VERTICAL); - itemDecorator.setDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.divider)); + SimpleDividerItemDecoration itemDecorator = new SimpleDividerItemDecoration(requireActivity(), SimpleDividerItemDecoration.VERTICAL); + itemDecorator.setDrawable(ContextCompat.getDrawable(requireActivity(), R.drawable.divider)); mBindings.mainList.addItemDecoration(itemDecorator); mAdapter = new ProdRientroMerceOrderDetailMtbColtListAdapter(new ObservableArrayList<>()); @@ -167,7 +167,7 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements public void addULButtonClick() { - this.openProgress(); + this.onLoadingStarted(); String codProd = this.currentOrder.getValue().getCodProd(); mArticoloRESTConsumer.getByCodMart(codProd, mtbAart -> { @@ -188,7 +188,7 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements mSystemRESTConsumer.>processSql(sql, new TypeToken>() {}.getType(), dtbOrdStep -> { - this.closeProgress(); + this.onLoadingEnded(); DialogInputLUProdDTO dialogInputLUProdDTO = new DialogInputLUProdDTO() .setMtbAart(mtbAart) @@ -216,9 +216,9 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements this.mViewModel.createLU(pickedQuantityDTO); }, () -> { - this.closeProgress(); + this.onLoadingEnded(); }) - .show(getActivity().getSupportFragmentManager(), "tag"); + .show(requireActivity().getSupportFragmentManager(), "tag"); }, this::onError); @@ -248,63 +248,63 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements if (currentOrder.getValue() != null) { switch (currentOrder.getValue().getStatoEnum()) { case IN_CORSO: - return ContextCompat.getDrawable(getActivity(), R.drawable.ic_play_circle_filled_24dp); + return ContextCompat.getDrawable(requireActivity(), R.drawable.ic_play_circle_filled_24dp); case PAUSA: - return ContextCompat.getDrawable(getActivity(), R.drawable.ic_pause_circle_filled_24dp); + return ContextCompat.getDrawable(requireActivity(), R.drawable.ic_pause_circle_filled_24dp); case PROGRAMMATO: default: - return ContextCompat.getDrawable(getActivity(), R.drawable.ic_clock_circle_outline_24dp); + return ContextCompat.getDrawable(requireActivity(), R.drawable.ic_clock_circle_outline_24dp); } } else - return ContextCompat.getDrawable(getActivity(), R.drawable.ic_clock_circle_outline_24dp); + return ContextCompat.getDrawable(requireActivity(), R.drawable.ic_clock_circle_outline_24dp); } public Integer getOrderStatusIconTintColor() { if (currentOrder.getValue() != null) { switch (currentOrder.getValue().getStatoEnum()) { case IN_CORSO: - return ContextCompat.getColor(getActivity(), R.color.green_800); + return ContextCompat.getColor(requireActivity(), R.color.green_800); case PAUSA: - return ContextCompat.getColor(getActivity(), R.color.yellow_800); + return ContextCompat.getColor(requireActivity(), R.color.yellow_800); case PROGRAMMATO: default: - return ContextCompat.getColor(getActivity(), R.color.blue_800); + return ContextCompat.getColor(requireActivity(), R.color.blue_800); } } else - return ContextCompat.getColor(getActivity(), R.color.blue_800); + return ContextCompat.getColor(requireActivity(), R.color.blue_800); } public Drawable getOrderStatusLabelBackgroud() { if (currentOrder.getValue() != null) { switch (currentOrder.getValue().getStatoEnum()) { case IN_CORSO: - return ContextCompat.getDrawable(getActivity(), R.drawable.label_success_text); + return ContextCompat.getDrawable(requireActivity(), R.drawable.label_success_text); case PAUSA: - return ContextCompat.getDrawable(getActivity(), R.drawable.label_warning_text); + return ContextCompat.getDrawable(requireActivity(), R.drawable.label_warning_text); case PROGRAMMATO: default: - return ContextCompat.getDrawable(getActivity(), R.drawable.label_primary_text); + return ContextCompat.getDrawable(requireActivity(), R.drawable.label_primary_text); } } else - return ContextCompat.getDrawable(getActivity(), R.drawable.label_primary_text); + return ContextCompat.getDrawable(requireActivity(), R.drawable.label_primary_text); } public Integer getOrderStatusLabelTextColor() { if (currentOrder.getValue() != null) { switch (currentOrder.getValue().getStatoEnum()) { case IN_CORSO: - return ContextCompat.getColor(getActivity(), R.color.green_800); + return ContextCompat.getColor(requireActivity(), R.color.green_800); case PAUSA: - return ContextCompat.getColor(getActivity(), R.color.yellow_800); + return ContextCompat.getColor(requireActivity(), R.color.yellow_800); case PROGRAMMATO: default: - return ContextCompat.getColor(getActivity(), R.color.blue_800); + return ContextCompat.getColor(requireActivity(), R.color.blue_800); } } else - return ContextCompat.getColor(getActivity(), R.color.blue_800); + return ContextCompat.getColor(requireActivity(), R.color.blue_800); } } \ No newline at end of file diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java index f55bc6d8..16efa4ac 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java @@ -334,7 +334,7 @@ public class ProdVersamentoMaterialeFragment extends BaseFragment implements Pro @Override public void onWarning(String warningText, Runnable action) { this.requireActivity().runOnUiThread(() -> { - this.closeProgress(); + this.onLoadingEnded(); DialogSimpleMessageView .makeWarningDialog(new SpannableString(Html.fromHtml(warningText)), null, action) .show(requireActivity().getSupportFragmentManager(), "tag"); 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 3edea0ab..438735c5 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 @@ -214,13 +214,10 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr private final RunnableArgs onScanSuccessful = data -> { - BarcodeManager.disable(); - - this.openProgress(); + this.onLoadingStarted(); this.mViewModel.processBarcodeDTO(data, () -> { - BarcodeManager.enable(); - this.closeProgress(); + this.onLoadingEnded(); }); }; @@ -334,12 +331,12 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr () -> onComplete.run(true), () -> onComplete.run(false) ) - .show(getActivity().getSupportFragmentManager(), "tag"); + .show(requireActivity().getSupportFragmentManager(), "tag"); } @Override public void onError(Exception ex) { - this.closeProgress(); + this.onLoadingEnded(); if (ex instanceof InvalidPesoKGException) { UtilityToast.showToast(ex.getMessage()); @@ -391,11 +388,11 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr .setPartitaMag(resultDTO.getPartitaMag()) .setDataScad(resultDTO.getDataScad()); - this.openProgress(); + this.onLoadingStarted(); onComplete.run(pickedQuantityDTO, shouldCloseLU); }) .setOnAbort(() -> { - this.closeProgress(); + this.onLoadingEnded(); }) .show(requireActivity().getSupportFragmentManager(), "tag"); } 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 b8e85a7d..38cf6c30 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 @@ -204,7 +204,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo boolean shouldAskPesoLU = SettingsManager.iDB().isFlagAskPesoColloSpedizione(); boolean useQtaOrd = SettingsManager.iDB().isFlagSpedizioneUseQtaOrd(); - if (!mEnableFakeGiacenza) this.openProgress(); + if (!mEnableFakeGiacenza) this.onLoadingStarted(); mViewmodel.init( codMdep, !mEnableFakeGiacenza, @@ -622,13 +622,10 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo private final RunnableArgs onScanSuccessful = data -> { - BarcodeManager.disable(); - - this.openProgress(); + this.onLoadingStarted(); this.mViewmodel.processBarcodeDTO(data, () -> { - BarcodeManager.enable(); - this.closeProgress(); + this.onLoadingEnded(); }); }; @@ -660,10 +657,10 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo public void createNewUL() { this.mBindings.spedizioneFab.close(true); - this.openProgress(); + this.onLoadingStarted(); this.mViewmodel.createNewLU(null, null, () -> { - this.closeProgress(); + this.onLoadingEnded(); }); } @@ -683,16 +680,6 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo this.mViewmodel.closeOrder(); } - @Override - public void onLoadingStarted() { - this.openProgress(); - } - - @Override - public void onLoadingEnded() { - this.closeProgress(); - } - @Override public void onLUOpened(MtbColt mtbColt) { this.addExtraItemsEnabled.set(SettingsManager.iDB().isFlagCanAddExtraItemSpedizione()); @@ -737,7 +724,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo @Override public void onLUPrintError(Exception ex, Runnable onComplete) { - this.closeProgress(); + this.onLoadingEnded(); DialogSimpleMessageView.makeErrorDialog( new SpannableString(ex.getMessage()), null, @@ -773,7 +760,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo @Override public void onError(Exception ex) { - this.closeProgress(); + this.onLoadingEnded(); if (ex instanceof InvalidPesoKGException) { UtilityToast.showToast(ex.getMessage()); @@ -834,7 +821,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo .setPartitaMag(resultDTO.getPartitaMag()) .setDataScad(resultDTO.getDataScad()); - this.openProgress(); + this.onLoadingStarted(); onComplete.run(pickedQuantityDTO, shouldCloseLU); }) .setOnAbort(() -> { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java index d33f5ca1..11d1fc4e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java @@ -158,7 +158,7 @@ public class UltimeConsegneClienteFragment extends BaseFragment implements Ultim } private void refreshItems() { - this.openProgress(); + this.onLoadingStarted(); String currentAnagFilter = mAppliedFilterViewModel != null ? mAppliedFilterViewModel.ragSoc.get() : null; String currentCodAnagFilter = null; @@ -247,22 +247,4 @@ public class UltimeConsegneClienteFragment extends BaseFragment implements Ultim this.mOnPreDestroyList.add(onPreDestroy); } - @Override - public void onLoadingStarted() { - BarcodeManager.disable(); - this.openProgress(); - } - - @Override - public void onLoadingEnded() { - this.closeProgress(); - BarcodeManager.enable(); - } - - @Override - public void onError(Exception ex) { - this.closeProgress(); - UtilityExceptions.defaultException(getActivity(), ex, mCurrentProgress); - BarcodeManager.enable(); - } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreFragment.java index f8bb6c07..f89d6af5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/UltimiArriviFornitoreFragment.java @@ -163,7 +163,7 @@ public class UltimiArriviFornitoreFragment extends BaseFragment implements ITitl } private void filterItems(List filteredMtbAarts) { - this.openProgress(); + this.onLoadingStarted(); String currentAnagFilter = mAppliedFilterViewModel != null ? mAppliedFilterViewModel.ragSoc.get() : null; String currentCodAnagFilter = null; @@ -252,25 +252,6 @@ public class UltimiArriviFornitoreFragment extends BaseFragment implements ITitl this.mOnPreDestroyList.add(onPreDestroy); } - @Override - public void onLoadingStarted() { - BarcodeManager.disable(); - this.openProgress(); - } - - @Override - public void onLoadingEnded() { - this.closeProgress(); - BarcodeManager.enable(); - } - - @Override - public void onError(Exception ex) { - this.closeProgress(); - UtilityExceptions.defaultException(getActivity(), ex, mCurrentProgress); - BarcodeManager.enable(); - } - @Override public void onMtbColtScanned(MtbColt scannedMtbColt) { 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 760777b4..39076ac2 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 @@ -117,7 +117,7 @@ public class VersamentoMerceFragment extends BaseFragment implements ITitledFrag null, this::openLU) .show(getActivity().getSupportFragmentManager(), "tag"); } - }).show(getActivity().getSupportFragmentManager(), "tag"); + }).show(requireActivity().getSupportFragmentManager(), "tag"); } @@ -130,12 +130,10 @@ public class VersamentoMerceFragment extends BaseFragment implements ITitledFrag } private final RunnableArgs onScanSuccessful = data -> { - BarcodeManager.disable(); - this.openProgress(); + this.onLoadingStarted(); this.mViewModel.processBarcodeDTO(data, () -> { - BarcodeManager.enable(); - this.closeProgress(); + this.onLoadingEnded(); }); }; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceViewModel.java index f30e1860..a49654b7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceViewModel.java @@ -54,20 +54,15 @@ public class VersamentoMerceViewModel { public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) { - - new Thread(() -> { - if (UtilityBarcode.isEtichettaPosizione(barcodeScanDTO, false)) { - this.executeEtichettaPosizione(barcodeScanDTO, onComplete); - } else if (UtilityBarcode.isEtichettaAnonima(barcodeScanDTO)) { - this.executeEtichettaLU(barcodeScanDTO.getStringValue(), true, onComplete); - } else if (UtilityBarcode.isEtichetta128(barcodeScanDTO)) { - this.executeEtichettaEan128(barcodeScanDTO, onComplete); - } else { - onComplete.run(); - } - }).start(); - - + if (UtilityBarcode.isEtichettaPosizione(barcodeScanDTO, false)) { + this.executeEtichettaPosizione(barcodeScanDTO, onComplete); + } else if (UtilityBarcode.isEtichettaAnonima(barcodeScanDTO)) { + this.executeEtichettaLU(barcodeScanDTO.getStringValue(), true, onComplete); + } else if (UtilityBarcode.isEtichetta128(barcodeScanDTO)) { + this.executeEtichettaEan128(barcodeScanDTO, onComplete); + } else { + onComplete.run(); + } } @@ -84,9 +79,8 @@ public class VersamentoMerceViewModel { } else if (mtbColtList.size() == 1) { mColliMagazzinoRESTConsumer.getByTestata(mtbColtList.get(0), true, false, mtbColt -> { - onComplete.run(); //TAKE HERE - pickMerceULtoUL(mtbColt); + pickMerceULtoUL(mtbColt, onComplete); }, this::sendError); } else { @@ -150,12 +144,11 @@ public class VersamentoMerceViewModel { if (mtbColt == null) { this.mColliMagazzinoRESTConsumer.createColloFromEtichettaAnonima(sscc, GestioneEnum.LAVORAZIONE, mtbColtAnonimo -> { onComplete.run(); - pickMerceULtoUL(mtbColtAnonimo); + pickMerceULtoUL(mtbColtAnonimo, onComplete); }, this::sendError); } else { - onComplete.run(); - pickMerceULtoUL(mtbColt); + pickMerceULtoUL(mtbColt, onComplete); } } @@ -164,7 +157,8 @@ public class VersamentoMerceViewModel { } - private void pickMerceULtoUL(MtbColt destMtbColt) { + private void pickMerceULtoUL(MtbColt destMtbColt, Runnable onComplete) { + this.sendOnLoadingStarted(); MtbColt sourceMtbColt = mCurrentMtbColt.getValue(); if (!UtilityString.equalsIgnoreCase(sourceMtbColt.getCodMdep(), destMtbColt.getCodMdep())) { @@ -181,21 +175,24 @@ public class VersamentoMerceViewModel { return; } + this.sendOnLoadingEnded(); this.sendOnArtsChooseRequired(mtbColrsToPick, pickedAarts -> { List destNewMtbColr = new ArrayList<>(); askQuantities(pickedAarts.iterator(), destNewMtbColr, () -> { + this.sendOnLoadingStarted(); MtbColt clonedSourceTestata = (MtbColt) sourceMtbColt.clone(); clonedSourceTestata.setMtbColr(new ObservableArrayList<>()); clonedSourceTestata.getMtbColr().addAll(destNewMtbColr); - this.sendOnLoadingStarted(); - this.mColliMagazzinoRESTConsumer.spostaArtsTraUL( clonedSourceTestata, destMtbColt, - this::sendOnDataSaved, + () -> { + this.sendOnDataSaved(); + onComplete.run(); + }, 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 ae48de19..2a30def6 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 @@ -255,9 +255,7 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment { private final RunnableArgs onScanSuccessfull = data -> { - BarcodeManager.disable(); - - openProgress(); + onLoadingStarted(); if (UtilityBarcode.isEan13(data)) { @@ -265,8 +263,7 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment { } else if (UtilityBarcode.isEtichetta128(data)) { this.executeEtichettaEan128(data); } else { - closeProgress(); - BarcodeManager.enable(); + onLoadingEnded(); } @@ -290,8 +287,7 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment { this.loadArticolo(barcodeProd, ean128Model); } else { DialogCommon.showNoArtFoundDialog(context, () -> { - BarcodeManager.enable(); - closeProgress(); + onLoadingEnded(); }); } @@ -300,16 +296,11 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment { } else { //EAN 128 non completo o comunque mancano i riferimenti al prodotto DialogCommon.showNoArtFoundDialog(context, () -> { - BarcodeManager.enable(); - closeProgress(); + onLoadingEnded(); }); } - }, ex -> { - closeProgress(); - UtilityExceptions.defaultException(context, ex); - BarcodeManager.enable(); - }); + }, this::onError); } @@ -326,22 +317,16 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment { this.searchArtInList(mtbAartList.get(0), ean128Model); - BarcodeManager.enable(); - closeProgress(); + onLoadingEnded(); } else { DialogCommon.showNoArtFoundDialog(context, () -> { - BarcodeManager.enable(); - closeProgress(); + onLoadingEnded(); }); } - }, ex -> { - closeProgress(); - BarcodeManager.enable(); - UtilityExceptions.defaultException(context, ex); - }); + }, this::onError); } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java index 77f25a64..3475fb95 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java @@ -175,12 +175,10 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia } private final RunnableArgs onScanSuccessful = data -> { - BarcodeManager.disable(); - this.openProgress(); + this.onLoadingStarted(); this.mViewModel.processBarcodeDTO(data, () -> { - this.closeProgress(); - BarcodeManager.enable(); + this.onLoadingEnded(); }); }; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtView.java index 2b3b7c87..1dcfaf2b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtView.java @@ -104,8 +104,7 @@ public class DialogScanArtView extends BaseDialogFragment implements DialogScanA private final RunnableArgs onScanSuccessfull = data -> { - BarcodeManager.disable(); - this.openProgress(); + this.onLoadingStarted(); this.mViewModel.processBarcodeDTO(data, (status, mtbAart, ean128Model, mtbColrList) -> { @@ -130,8 +129,7 @@ public class DialogScanArtView extends BaseDialogFragment implements DialogScanA } - BarcodeManager.enable(); - this.closeProgress(); + this.onLoadingEnded(); dismiss(); }); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java index 3270801e..cec29798 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java @@ -11,7 +11,6 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; import androidx.databinding.DataBindingUtil; import org.jetbrains.annotations.NotNull; @@ -28,7 +27,6 @@ import it.integry.integrywmsnative.core.expansion.BaseDialogFragment; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.expansion.RunnableArgss; import it.integry.integrywmsnative.core.model.MtbColt; -import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.databinding.DialogScanOrCreateLuBinding; import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; import it.integry.integrywmsnative.view.dialogs.basket_lu.DialogBasketLU; @@ -133,12 +131,10 @@ public class DialogScanOrCreateLUView extends BaseDialogFragment implements Dial } private final RunnableArgs onScanSuccessfull = data -> { - BarcodeManager.disable(); - this.openProgress(); + this.onLoadingStarted(); this.mViewModel.processBarcodeDTO(data, () -> { - BarcodeManager.enable(); - this.closeProgress(); + this.onLoadingEnded(); }); }; @@ -159,7 +155,7 @@ public class DialogScanOrCreateLUView extends BaseDialogFragment implements Dial }, () -> { onConfirm.run(false); }) - .show(((AppCompatActivity) getActivity()).getSupportFragmentManager(), "tag"); + .show(requireActivity().getSupportFragmentManager(), "tag"); } @Override @@ -169,21 +165,4 @@ public class DialogScanOrCreateLUView extends BaseDialogFragment implements Dial dismiss(); } - @Override - public void onError(Exception ex) { - this.closeProgress(); - UtilityExceptions.defaultException(getActivity(), ex); - BarcodeManager.enable(); - } - - @Override - public void onLoadingStarted() { - this.openProgress(); - } - - @Override - public void onLoadingEnded() { - this.closeProgress(); - } - }