Fix after merge
This commit is contained in:
parent
53ba5a962b
commit
044bcbd852
@ -167,8 +167,6 @@ public class DialogAskPositionOfLUView extends BaseDialogFragment {
|
||||
mBarcodeScannerInstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
|
||||
.setOnScanSuccessful(onScanSuccessfull)
|
||||
.setOnScanFailed(this::onError));
|
||||
|
||||
BarcodeManager.enable();
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -180,7 +178,7 @@ public class DialogAskPositionOfLUView extends BaseDialogFragment {
|
||||
|
||||
|
||||
private final RunnableArgs<BarcodeScanDTO> onScanSuccessfull = data -> {
|
||||
BarcodeManager.disable();
|
||||
BarcodeManager.disable(mBarcodeScannerInstanceID);
|
||||
|
||||
if (!isOnLivelloPage()) {
|
||||
|
||||
@ -191,11 +189,10 @@ public class DialogAskPositionOfLUView extends BaseDialogFragment {
|
||||
|
||||
if (!mCheckForLineaProd && !currentMtbDepoPosizione.isFlagLineaProduzione() && UtilityPosizione.isPosizioneWithLivello(foundPosizione)) {
|
||||
askLivello();
|
||||
BarcodeManager.enable();
|
||||
BarcodeManager.enable(mBarcodeScannerInstanceID);
|
||||
} else {
|
||||
completedFlow = true;
|
||||
|
||||
BarcodeManager.enable();
|
||||
if (onComplete != null)
|
||||
onComplete.run(DialogConsts.Results.YES, foundPosizione);
|
||||
|
||||
@ -203,14 +200,14 @@ public class DialogAskPositionOfLUView extends BaseDialogFragment {
|
||||
}
|
||||
|
||||
} else {
|
||||
BarcodeManager.enable();
|
||||
BarcodeManager.enable(mBarcodeScannerInstanceID);
|
||||
Toast.makeText(requireContext(), "Barcode non riconosciuto", Toast.LENGTH_SHORT)
|
||||
.show();
|
||||
}
|
||||
} else {
|
||||
Toast.makeText(requireContext(), "Barcode non riconosciuto", Toast.LENGTH_SHORT)
|
||||
.show();
|
||||
BarcodeManager.enable();
|
||||
BarcodeManager.enable(mBarcodeScannerInstanceID);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@ -138,7 +138,6 @@ public class DialogScanOrCreateLUView extends BaseDialogFragment implements Dial
|
||||
mBarcodeScannerInstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
|
||||
.setOnScanSuccessful(onScanSuccessfull)
|
||||
.setOnScanFailed(this::onError));
|
||||
BarcodeManager.enable();
|
||||
setBarcodeListener(true);
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user