Merge branch 'duel_settlement' of https://hub.utsmyanmar.com/Kyaw_Min_Khant/KBZ-POS into duel_settlement
This commit is contained in:
commit
309d105fe1
@ -160,12 +160,18 @@ public class MainFragment extends DataBindingFragment {
|
||||
NexGoSDK.getInstance().cancelCheckCard();
|
||||
NexGoSDK.getInstance().closeReader();
|
||||
enableHomeButton();
|
||||
enablePinPadSound(false);
|
||||
// disableTaskButton();
|
||||
// BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar();
|
||||
// BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar();
|
||||
});
|
||||
}
|
||||
|
||||
private void enablePinPadSound(boolean flag) {
|
||||
int result = BaseApplication.getInstance().deviceEngine.getPlatform().enablePinpadBeep(flag);
|
||||
LogUtil.d(TAG, "Pin Pad Beep Result:" + result);
|
||||
}
|
||||
|
||||
private void disableHomeButton() {
|
||||
int result = BaseApplication.getInstance().deviceEngine.getPlatform().disableHomeButton();
|
||||
LogUtil.d(TAG, "Disable Home Button Result:" + result);
|
||||
|
||||
@ -256,14 +256,6 @@ public class CardWaitingFragment extends DataBindingFragment implements DataBind
|
||||
|
||||
HashSet<CardSlotTypeEnum> allType = new HashSet<>();
|
||||
allType.clear();
|
||||
// if(sharedViewModel.getIsSeePhone().getValue() != null && sharedViewModel.getIsSeePhone().getValue()) {
|
||||
// allType.add(CardSlotTypeEnum.RF);
|
||||
// waitTimeout = 20;
|
||||
// } else {
|
||||
// allType.add(CardSlotTypeEnum.ICC1);
|
||||
// allType.add(CardSlotTypeEnum.RF);
|
||||
// allType.add(CardSlotTypeEnum.SWIPE);
|
||||
// }
|
||||
if(sharedViewModel.getIsSeePhone().getValue() != null && sharedViewModel.getIsSeePhone().getValue()) {
|
||||
allType.add(CardSlotTypeEnum.RF);
|
||||
waitTimeout = 20;
|
||||
@ -273,9 +265,13 @@ public class CardWaitingFragment extends DataBindingFragment implements DataBind
|
||||
} else {
|
||||
allType.add(CardSlotTypeEnum.ICC1);
|
||||
allType.add(CardSlotTypeEnum.RF);
|
||||
|
||||
if(SystemParamsOperation.getInstance().isMagStripeEnabled()) {
|
||||
allType.add(CardSlotTypeEnum.SWIPE);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// int allType = AidlConstants.CardType.IC.getValue() | AidlConstants.CardType.MAGNETIC.getValue();
|
||||
|
||||
|
||||
|
||||
@ -558,6 +558,7 @@ public abstract class EmvBaseViewModel extends BaseViewModel {
|
||||
byte[] panBytes = cardNo.substring( length- 13).getBytes(StandardCharsets.US_ASCII);
|
||||
LogUtil.d(TAG,"card num :"+cardNo);
|
||||
LogUtil.d(TAG,"Is Online Pin:"+isOnlinePin);
|
||||
|
||||
// pinPad.inputOnlinePin(supperLen, 60, pan, 0, PinAlgorithmModeEnum.ISO9564FMT0, pinPadInputListener);
|
||||
if (isOnlinePin) {
|
||||
|
||||
|
||||
@ -401,9 +401,13 @@ public class FieldUtils {
|
||||
|
||||
field.setDataStr("61"); // BPC
|
||||
// field.setDataStr("00");// MPU
|
||||
} else {
|
||||
if (FALLBACK == cardType){ // Fallback
|
||||
field.setDataStr("02");
|
||||
} else {
|
||||
field.setDataStr("00");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user