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

Compare commits

base: Kyaw_Min_Khant:66680c0baf59f81a5a16977ab7493ad6b5c641b0
Branches Tags
Kyaw_Min_Khant:main
Kyaw_Min_Khant:ecr_two
Kyaw_Min_Khant:ecr
Kyaw_Min_Khant:duel_settlement
Kyaw_Min_Khant:new_history
Kyaw_Min_Khant:duel_currency
Kyaw_Min_Khant:animation
Kyaw_Min_Khant:merge_latest_SIT
Kyaw_Min_Khant:geo
Kyaw_Min_Khant:auto_print_disable
Kyaw_Min_Khant:refund_fix
Kyaw_Min_Khant:production_1.0
Kyaw_Min_Khant:merge-latest
Kyaw_Min_Khant:latest
Kyaw_Min_Khant:mpu_latest
Kyaw_Min_Khant:merge_with_mpu
Kyaw_Min_Khant:mpu
Kyaw_Min_Khant:merge
Kyaw_Min_Khant:master
..
compare: Kyaw_Min_Khant:b808a87f231c926451b40c5f2a61c5e7d384c884
Branches Tags
Kyaw_Min_Khant:ecr_two
Kyaw_Min_Khant:ecr
Kyaw_Min_Khant:duel_settlement
Kyaw_Min_Khant:new_history
Kyaw_Min_Khant:duel_currency
Kyaw_Min_Khant:animation
Kyaw_Min_Khant:merge_latest_SIT
Kyaw_Min_Khant:geo
Kyaw_Min_Khant:auto_print_disable
Kyaw_Min_Khant:refund_fix
Kyaw_Min_Khant:production_1.0
Kyaw_Min_Khant:merge-latest
Kyaw_Min_Khant:latest
Kyaw_Min_Khant:mpu_latest
Kyaw_Min_Khant:merge_with_mpu
Kyaw_Min_Khant:mpu
Kyaw_Min_Khant:merge
Kyaw_Min_Khant:master
Kyaw_Min_Khant:main

No commits in common. "66680c0baf59f81a5a16977ab7493ad6b5c641b0" and "b808a87f231c926451b40c5f2a61c5e7d384c884" have entirely different histories.
66680c0baf ... b808a87f23

4 changed files with 14 additions and 16 deletions
Show Stats Expand all files Collapse all files

6
app/build.gradle
View File

@ -14,8 +14,8 @@ android {
applicationId "com.utsmm.kbz" applicationId "com.utsmm.kbz"
minSdk 24 minSdk 24
targetSdk 33 targetSdk 33
versionCode 24 versionCode 21
versionName "2.4" versionName "2.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
@ -49,7 +49,7 @@ android {
buildTypes { buildTypes {
release { release {
minifyEnabled false minifyEnabled true
shrinkResources false shrinkResources false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} }

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

@ -652,7 +652,7 @@ public abstract class EmvBaseViewModel extends BaseViewModel {
byte[] aid = emvHandler.getTlv(new byte[]{0x4F}, EmvDataSourceEnum.FROM_KERNEL); byte[] aid = emvHandler.getTlv(new byte[]{0x4F}, EmvDataSourceEnum.FROM_KERNEL);
LogUtil.d(TAG, "onTransInitBeforeGPO :"); LogUtil.d(TAG, "onTransInitBeforeGPO :");
String terminalCapability = SystemParamsOperation.getInstance().getTerminalCapability(); String terminalCapability = SystemParamsOperation.getInstance().getTerminalCapability();
LogUtil.d(TAG,"Terminal capability : " + terminalCapability ); LogUtil.d(TAG,"Terminal capability :"+terminalCapability);
// emvHandler.setTlv(new byte[]{(byte) 0x9F, (byte) 0x33}, new byte[]{(byte) 0xE0, (byte) 0x28, (byte) 0xC8}); // emvHandler.setTlv(new byte[]{(byte) 0x9F, (byte) 0x33}, new byte[]{(byte) 0xE0, (byte) 0x28, (byte) 0xC8});
emvHandler.setTlv(new byte[]{(byte) 0x9F, (byte) 0x33}, ByteUtil.hexStr2Bytes(terminalCapability)); emvHandler.setTlv(new byte[]{(byte) 0x9F, (byte) 0x33}, ByteUtil.hexStr2Bytes(terminalCapability));
if (mPayDetail.getCardType() == CardTypeX.NFC.value) { if (mPayDetail.getCardType() == CardTypeX.NFC.value) {
@ -675,7 +675,7 @@ public abstract class EmvBaseViewModel extends BaseViewModel {
} else { } else {
//contact terminal capability ; if different card brand(depend on aid) have different terminal capability //contact terminal capability ; if different card brand(depend on aid) have different terminal capability
if (ByteUtils.byteArray2HexString(aid).toUpperCase().contains("A000000004")) { if (ByteUtils.byteArray2HexString(aid).toUpperCase().contains("A000000004")) {
emvHandler.setTlv(new byte[]{(byte) 0x9F, (byte) 0x33}, new byte[]{(byte) 0xE0, (byte) 0xF0, (byte) 0xC8}); emvHandler.setTlv(new byte[]{(byte) 0x9F, (byte) 0x33}, new byte[]{(byte) 0xE0, (byte) 0x28, (byte) 0xC8});
emvHandler.setTlv(new byte[]{(byte) 0x9F, (byte) 0x1D}, ByteUtils.hexString2ByteArray("6C00800000000000"));//terminal risk emvHandler.setTlv(new byte[]{(byte) 0x9F, (byte) 0x1D}, ByteUtils.hexString2ByteArray("6C00800000000000"));//terminal risk
} }
@ -1232,8 +1232,7 @@ public abstract class EmvBaseViewModel extends BaseViewModel {
emvHandler.setTlv(new byte[]{(byte) 0x9F, (byte) 0x1d}, ByteUtils.hexString2ByteArray("4C00800000000000")); emvHandler.setTlv(new byte[]{(byte) 0x9F, (byte) 0x1d}, ByteUtils.hexString2ByteArray("4C00800000000000"));
} else { } else {
//set 9F1D terminal risk management - MasterCard. it should be same with the MTIP configuration for 9F1D //set 9F1D terminal risk management - MasterCard. it should be same with the MTIP configuration for 9F1D
// emvHandler.setTlv(new byte[]{(byte) 0x9F, (byte) 0x1d}, ByteUtils.hexString2ByteArray("6C00800000000000")); emvHandler.setTlv(new byte[]{(byte) 0x9F, (byte) 0x1d}, ByteUtils.hexString2ByteArray("6C00800000000000"));
emvHandler.setTlv(new byte[]{(byte) 0x9F, (byte) 0x1d}, ByteUtils.hexString2ByteArray("6C7A800000000000"));
} }

16
baselib/src/main/res/raw/paypass_config.json
View File

@ -10,8 +10,8 @@
"targetPercent": "99", "targetPercent": "99",
"maxTargetPercent": "99", "maxTargetPercent": "99",
"threshold": "00000040", "threshold": "00000040",
"tacDefault": "F45084800C", "tacDefault": "D84000A800",
"tacOnline": "F45084800C", "tacOnline": "DC4004F800",
"tacDenial": "0000000000", "tacDenial": "0000000000",
"floorLimit": "000000000000", "floorLimit": "000000000000",
"cvmLimit": 75000, "cvmLimit": 75000,
@ -35,8 +35,8 @@
"targetPercent": "99", "targetPercent": "99",
"maxTargetPercent": "99", "maxTargetPercent": "99",
"threshold": "00000040", "threshold": "00000040",
"tacDefault": "F45084800C", "tacDefault": "D84000A800",
"tacOnline": "F45084800C", "tacOnline": "DC4004F800",
"tacDenial": "0000000000", "tacDenial": "0000000000",
"floorLimit": "000000000000", "floorLimit": "000000000000",
"cvmLimit": 75000, "cvmLimit": 75000,
@ -61,8 +61,8 @@
"targetPercent": "99", "targetPercent": "99",
"maxTargetPercent": "99", "maxTargetPercent": "99",
"threshold": "00000040", "threshold": "00000040",
"tacDefault": "F45084800C", "tacDefault": "D84000A800",
"tacOnline": "F45084800C", "tacOnline": "DC4004F800",
"tacDenial": "0000000000", "tacDenial": "0000000000",
"floorLimit": "000000000000", "floorLimit": "000000000000",
"cvmLimit": 75000, "cvmLimit": 75000,
@ -86,8 +86,8 @@
"targetPercent": "99", "targetPercent": "99",
"maxTargetPercent": "99", "maxTargetPercent": "99",
"threshold": "00000040", "threshold": "00000040",
"tacDefault": "F45084800C", "tacDefault": "D84000A800",
"tacOnline": "F45084800C", "tacOnline": "DC4004F800",
"tacDenial": "0000000000", "tacDenial": "0000000000",
"floorLimit": "000000000000", "floorLimit": "000000000000",
"cvmLimit": 75000, "cvmLimit": 75000,

1
paylibs/src/main/java/com/utsmyanmar/paylibs/transactions/TransactionsOperation.java
View File

@ -456,7 +456,6 @@ public class TransactionsOperation {
// } // }
// //
// } // }
if(equals) { if(equals) {
emvOnlineResult.setRejCode("00"); emvOnlineResult.setRejCode("00");
emvOnlineResult.setRecvField55(null); emvOnlineResult.setRecvField55(null);