diff --git a/baselib/src/main/java/com/utsmyanmar/baselib/emv/EmvParamHelper.java b/baselib/src/main/java/com/utsmyanmar/baselib/emv/EmvParamHelper.java index fd2b128..9d3e62d 100644 --- a/baselib/src/main/java/com/utsmyanmar/baselib/emv/EmvParamHelper.java +++ b/baselib/src/main/java/com/utsmyanmar/baselib/emv/EmvParamHelper.java @@ -410,7 +410,7 @@ public class EmvParamHelper { private AidEntity convertContactAIDNex(ContactAid contactAid) { AidEntity aidV2 = new AidEntity(); - aidV2.setTransType("FF"); + aidV2.setTransType("00"); aidV2.setOnlinePinCap(1); aidV2.setAsi(0); //1 // aidV2.setThreshold(99); diff --git a/baselib/src/main/java/com/utsmyanmar/baselib/viewModel/EmvBaseViewModel.java b/baselib/src/main/java/com/utsmyanmar/baselib/viewModel/EmvBaseViewModel.java index 6b67764..9de493d 100644 --- a/baselib/src/main/java/com/utsmyanmar/baselib/viewModel/EmvBaseViewModel.java +++ b/baselib/src/main/java/com/utsmyanmar/baselib/viewModel/EmvBaseViewModel.java @@ -276,7 +276,7 @@ public abstract class EmvBaseViewModel extends BaseViewModel { LogUtil.d(TAG, "TransData :" + transData.getTransAmount()); LogUtil.d(TAG, "start emv "); - emvHandler.emvDebugLog(true); +// emvHandler.emvDebugLog(true); emvHandler.emvProcess(transData, emvProcessListener); @@ -308,7 +308,7 @@ public abstract class EmvBaseViewModel extends BaseViewModel { } } - public void setEmvAppSelect(int position) { + public void setEmvAppSelect(int position ) { if (emvHandler == null) { LogUtil.e(TAG, "Cannot set EMV app selection - emvHandler is null"); emvResultStatus.postValue(EmvResultStatus.ERROR); @@ -316,8 +316,8 @@ public abstract class EmvBaseViewModel extends BaseViewModel { return; } try { - LogUtil.d(TAG, "Selected :" + position); - emvHandler.onSetSelAppResponse(position); + LogUtil.d(TAG, "Selected :" + position + 1); + emvHandler.onSetSelAppResponse(position + 1); } catch (Exception e) { LogUtil.e(TAG, "Exception during app selection: " + e.getMessage()); e.printStackTrace(); @@ -579,6 +579,21 @@ public abstract class EmvBaseViewModel extends BaseViewModel { private OnEmvProcessListener2 emvProcessListener = new OnEmvProcessListener2() { @Override public void onSelApp(List list, List list1, boolean b) { + LogUtil.d(TAG, "list" + list); + LogUtil.d(TAG, "list2" + list1); + for (String item: list){ + LogUtil.d(TAG, "list " + item); + } + for(CandidateAppInfoEntity item: list1) { + LogUtil.d(TAG,"aid :"+ByteUtil.bytes2HexStr(item.getAid())); + LogUtil.d(TAG,"app label :"+ByteUtil.bytes2HexStr(item.getAppLabel())); + if(item.getPreferName() == null){ + LogUtil.d(TAG,"prefer name :"+ "is Null"); + }else{ + LogUtil.d(TAG,"prefer name :"+ByteUtil.bytes2HexStr(item.getPreferName())); + } + LogUtil.d(TAG,"priority :"+ByteUtil.byte2HexStr(item.getPriority())); + } mProcessStep = EMV_APP_SELECT; LogUtil.d(TAG, "onWaitAppSelect :"); String[] candidateNames = getCandidateNames(list);