Kyaw_Min_Khant/KBZ-POS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'duel_settlement' of https://hub.utsmyanmar.com/Kyaw_Min_Khant/KBZ-POS into duel_settlement

Browse Source
This commit is contained in:
moon 2026-05-06 15:43:32 +06:30
commit 309d105fe1
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/utsmm/kbz/MainFragment.java
View File

@ -160,12 +160,18 @@ public class MainFragment extends DataBindingFragment {
NexGoSDK.getInstance().cancelCheckCard(); NexGoSDK.getInstance().cancelCheckCard();
NexGoSDK.getInstance().closeReader(); NexGoSDK.getInstance().closeReader();
enableHomeButton(); enableHomeButton();
enablePinPadSound(false);
// disableTaskButton(); // disableTaskButton();
// BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar(); // BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar();
// BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar(); // 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() { private void disableHomeButton() {
int result = BaseApplication.getInstance().deviceEngine.getPlatform().disableHomeButton(); int result = BaseApplication.getInstance().deviceEngine.getPlatform().disableHomeButton();
LogUtil.d(TAG, "Disable Home Button Result:" + result); LogUtil.d(TAG, "Disable Home Button Result:" + result);

12
app/src/main/java/com/utsmm/kbz/ui/core_ui/CardWaitingFragment.java
View File

@ -256,14 +256,6 @@ public class CardWaitingFragment extends DataBindingFragment implements DataBind
HashSet<CardSlotTypeEnum> allType = new HashSet<>(); HashSet<CardSlotTypeEnum> allType = new HashSet<>();
allType.clear(); 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()) { if(sharedViewModel.getIsSeePhone().getValue() != null && sharedViewModel.getIsSeePhone().getValue()) {
allType.add(CardSlotTypeEnum.RF); allType.add(CardSlotTypeEnum.RF);
waitTimeout = 20; waitTimeout = 20;
@ -273,9 +265,13 @@ public class CardWaitingFragment extends DataBindingFragment implements DataBind
} else { } else {
allType.add(CardSlotTypeEnum.ICC1); allType.add(CardSlotTypeEnum.ICC1);
allType.add(CardSlotTypeEnum.RF); allType.add(CardSlotTypeEnum.RF);
if(SystemParamsOperation.getInstance().isMagStripeEnabled()) {
allType.add(CardSlotTypeEnum.SWIPE); allType.add(CardSlotTypeEnum.SWIPE);
} }
}
// int allType = AidlConstants.CardType.IC.getValue() | AidlConstants.CardType.MAGNETIC.getValue(); // int allType = AidlConstants.CardType.IC.getValue() | AidlConstants.CardType.MAGNETIC.getValue();

1
baselib/src/main/java/com/utsmyanmar/baselib/viewModel/EmvBaseViewModel.java
View File

@ -558,6 +558,7 @@ public abstract class EmvBaseViewModel extends BaseViewModel {
byte[] panBytes = cardNo.substring( length- 13).getBytes(StandardCharsets.US_ASCII); byte[] panBytes = cardNo.substring( length- 13).getBytes(StandardCharsets.US_ASCII);
LogUtil.d(TAG,"card num :"+cardNo); LogUtil.d(TAG,"card num :"+cardNo);
LogUtil.d(TAG,"Is Online Pin:"+isOnlinePin); LogUtil.d(TAG,"Is Online Pin:"+isOnlinePin);
// pinPad.inputOnlinePin(supperLen, 60, pan, 0, PinAlgorithmModeEnum.ISO9564FMT0, pinPadInputListener); // pinPad.inputOnlinePin(supperLen, 60, pan, 0, PinAlgorithmModeEnum.ISO9564FMT0, pinPadInputListener);
if (isOnlinePin) { if (isOnlinePin) {

4
paylibs/src/main/java/com/utsmyanmar/paylibs/utils/iso_utils/FieldUtils.java
View File

@ -401,9 +401,13 @@ public class FieldUtils {
field.setDataStr("61"); // BPC field.setDataStr("61"); // BPC
// field.setDataStr("00");// MPU // field.setDataStr("00");// MPU
} else {
if (FALLBACK == cardType){ // Fallback
field.setDataStr("02");
} else { } else {
field.setDataStr("00"); field.setDataStr("00");
} }
}