diff --git a/app/build.gradle b/app/build.gradle index f441132..21c9881 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,8 +14,8 @@ android { applicationId "com.utsmm.kbz" minSdk 24 targetSdk 33 - versionCode 26 - versionName "2.6" + versionCode 31 + versionName "2.11" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/sit/release/baselineProfiles/0/app-sit-release.dm b/app/sit/release/baselineProfiles/0/app-sit-release.dm index 3fd91cb..58c7975 100644 Binary files a/app/sit/release/baselineProfiles/0/app-sit-release.dm and b/app/sit/release/baselineProfiles/0/app-sit-release.dm differ diff --git a/app/sit/release/baselineProfiles/1/app-sit-release.dm b/app/sit/release/baselineProfiles/1/app-sit-release.dm index 5ef1955..e9cb8ec 100644 Binary files a/app/sit/release/baselineProfiles/1/app-sit-release.dm and b/app/sit/release/baselineProfiles/1/app-sit-release.dm differ diff --git a/app/sit/release/output-metadata.json b/app/sit/release/output-metadata.json index 4a6e51c..ecaf590 100644 --- a/app/sit/release/output-metadata.json +++ b/app/sit/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 2, - "versionName": "1.01-sit", + "versionCode": 30, + "versionName": "2.10-sit", "outputFile": "app-sit-release.apk" } ], diff --git a/app/src/main/java/com/utsmm/kbz/MainActivity.java b/app/src/main/java/com/utsmm/kbz/MainActivity.java index 2c87574..e1a10bc 100644 --- a/app/src/main/java/com/utsmm/kbz/MainActivity.java +++ b/app/src/main/java/com/utsmm/kbz/MainActivity.java @@ -159,10 +159,10 @@ public class MainActivity extends AppCompatActivity implements } private void initKey(){ -// SystemParamsOperation.getInstance().setTmsAddress("https://api-tms-uat.kbzbank.com:8443/sirius"); - SystemParamsOperation.getInstance().setTmsAddress("https://sirius-nest.utsmyanmar.com"); -// SystemParamsOperation.getInstance().setEReceiptAddress("https://api-tms-uat.kbzbank.com:8443/receipt"); - SystemParamsOperation.getInstance().setEReceiptAddress("https://receipt-nest.utsmyanmar.com"); + SystemParamsOperation.getInstance().setTmsAddress("https://api-tms-uat.kbzbank.com:8443/sirius"); +// SystemParamsOperation.getInstance().setTmsAddress("https://sirius-nest.utsmyanmar.com"); + SystemParamsOperation.getInstance().setEReceiptAddress("https://api-tms-uat.kbzbank.com:8443/receipt"); +// SystemParamsOperation.getInstance().setEReceiptAddress("https://receipt-nest.utsmyanmar.com"); PinPad pinPad = MyApplication.getInstance().deviceEngine.getPinPad(); byte[] encryptedPIK = SystemParamsOperation.getInstance().getPIK(); diff --git a/app/src/main/java/com/utsmm/kbz/ui/qr_pay/RefundCertificateManager.java b/app/src/main/java/com/utsmm/kbz/ui/qr_pay/RefundCertificateManager.java index ec51cd8..136ab3f 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/qr_pay/RefundCertificateManager.java +++ b/app/src/main/java/com/utsmm/kbz/ui/qr_pay/RefundCertificateManager.java @@ -42,8 +42,8 @@ public class RefundCertificateManager { return; }; - String downloadBase = tmsAddress.trim() + "/api/v1/file/download?filePath="; //local -// String downloadBase = tmsAddress.trim() + "/file/download?filePath="; // uat and prod +// String downloadBase = tmsAddress.trim() + "/api/v1/file/download?filePath="; //local + String downloadBase = tmsAddress.trim() + "/file/download?filePath="; // uat and prod String certUrl = SystemParamsOperation.getInstance().getCertificateUrl(); String clientCertUrl = SystemParamsOperation.getInstance().getCertificateClientUrl(); diff --git a/app/uat/release/baselineProfiles/0/app-uat-release.dm b/app/uat/release/baselineProfiles/0/app-uat-release.dm index 5279a49..61ca449 100644 Binary files a/app/uat/release/baselineProfiles/0/app-uat-release.dm and b/app/uat/release/baselineProfiles/0/app-uat-release.dm differ diff --git a/app/uat/release/baselineProfiles/1/app-uat-release.dm b/app/uat/release/baselineProfiles/1/app-uat-release.dm index 9f46aca..4e42652 100644 Binary files a/app/uat/release/baselineProfiles/1/app-uat-release.dm and b/app/uat/release/baselineProfiles/1/app-uat-release.dm differ diff --git a/app/uat/release/output-metadata.json b/app/uat/release/output-metadata.json index 8b7cf73..915e8dc 100644 --- a/app/uat/release/output-metadata.json +++ b/app/uat/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 1, - "versionName": "1.00-uat", + "versionCode": 31, + "versionName": "2.11-uat", "outputFile": "app-uat-release.apk" } ], diff --git a/baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java b/baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java index 6eecfb1..c8732f3 100644 --- a/baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java +++ b/baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java @@ -287,8 +287,8 @@ public class NetworkModule { tmsAddress = getTMSUrlFromNative(); } - String baseUrl = tmsAddress.trim() + "/api/v1/"; //for on prim -// String baseUrl = tmsAddress.trim() + "/"; //for uat and prod +// String baseUrl = tmsAddress.trim() + "/api/v1/"; //for on prim + String baseUrl = tmsAddress.trim() + "/"; //for uat and prod final Gson gson = new GsonBuilder().create(); diff --git a/baselib/src/main/res/raw/contacts_config.json b/baselib/src/main/res/raw/contacts_config.json index ec4fcce..43f7c3b 100644 --- a/baselib/src/main/res/raw/contacts_config.json +++ b/baselib/src/main/res/raw/contacts_config.json @@ -2,237 +2,7 @@ { "aidEnable": true, - "aid": "A0000000031010", - "cardScheme": "VISA", - "applicationVersion": "0030", - "emvDDOL": "9F3704", - "emvTDOL": "9F3704", - "partialAidSelection": false, - "targetPercent": "99", - "maxTargetPercent": "99", - "threshold": "00000040", - "tacDefault": "D84000A800", - "tacOnline": "DC4004F800", - "tacDenial": "0010000000", - "floorLimit": "000000000000", - "cvmLimit": 75000, - "transLimit": "999999999999", - "transLimitCDV": "999999999999", - "terminalCapability": "0000000000000000", - "riskManageData": "01", - "cateCode": "2701", - "currencyCode": "0104" - }, - { - "aidEnable": true, - "aid": "A0000000032010", - "cardScheme": "VISA", - "applicationVersion": "0030", - "emvDDOL": "9F3704", - "emvTDOL": "9F3704", - "partialAidSelection": false, - "targetPercent": "99", - "maxTargetPercent": "99", - "threshold": "00000040", - "tacDefault": "D84000A800", - "tacOnline": "DC4004F800", - "tacDenial": "0010000000", - "floorLimit": "000000000000", - "cvmLimit": 75000, - "transLimit": "999999999999", - "transLimitCDV": "999999999999", - "terminalCapability": "0000000000000000", - "riskManageData": "01", - "cateCode": "2701", - "currencyCode": "0104" - }, - { - "aidEnable": true, - "aid": "A000000003101001", - "cardScheme": "VISA", - "applicationVersion": "0030", - "emvDDOL": "9F3704", - "emvTDOL": "9F3704", - "partialAidSelection": false, - "targetPercent": "99", - "maxTargetPercent": "99", - "threshold": "00000040", - "tacDefault": "D84000A800", - "tacOnline": "DC4004F800", - "tacDenial": "0010000000", - "floorLimit": "000000000000", - "cvmLimit": 75000, - "transLimit": "999999999999", - "transLimitCDV": "999999999999", - "terminalCapability": "0000000000000000", - "riskManageData": "01", - "cateCode": "2701", - "currencyCode": "0104" - }, - { - "aidEnable": true, - "aid": "A000000003101002", - "cardScheme": "VISA", - "applicationVersion": "0030", - "emvDDOL": "9F3704", - "emvTDOL": "9F3704", - "partialAidSelection": false, - "targetPercent": "99", - "maxTargetPercent": "99", - "threshold": "00000040", - "tacDefault": "D84000A800", - "tacOnline": "DC4004F800", - "tacDenial": "0010000000", - "floorLimit": "000000000000", - "cvmLimit": 75000, - "transLimit": "999999999999", - "transLimitCDV": "999999999999", - "terminalCapability": "0000000000000000", - "riskManageData": "01", - "cateCode": "2701", - "currencyCode": "0104" - }, - { - "aidEnable": true, - "aid": "A000000003101003", - "cardScheme": "VISA", - "applicationVersion": "0030", - "emvDDOL": "9F3704", - "emvTDOL": "9F3704", - "partialAidSelection": false, - "targetPercent": "99", - "maxTargetPercent": "99", - "threshold": "00000040", - "tacDefault": "D84000A800", - "tacOnline": "DC4004F800", - "tacDenial": "0010000000", - "floorLimit": "000000000000", - "cvmLimit": 75000, - "transLimit": "999999999999", - "transLimitCDV": "999999999999", - "terminalCapability": "0000000000000000", - "riskManageData": "01", - "cateCode": "2701", - "currencyCode": "0104" - }, - { - "aidEnable": true, - "aid": "A000000003101004", - "cardScheme": "VISA", - "applicationVersion": "0030", - "emvDDOL": "9F3704", - "emvTDOL": "9F3704", - "partialAidSelection": false, - "targetPercent": "99", - "maxTargetPercent": "99", - "threshold": "00000040", - "tacDefault": "D84000A800", - "tacOnline": "DC4004F800", - "tacDenial": "0010000000", - "floorLimit": "000000000000", - "cvmLimit": 75000, - "transLimit": "999999999999", - "transLimitCDV": "999999999999", - "terminalCapability": "0000000000000000", - "riskManageData": "01", - "cateCode": "2701", - "currencyCode": "0104" - }, - { - "aidEnable": true, - "aid": "A000000003101005", - "cardScheme": "VISA", - "applicationVersion": "0030", - "emvDDOL": "9F3704", - "emvTDOL": "9F3704", - "partialAidSelection": false, - "targetPercent": "99", - "maxTargetPercent": "99", - "threshold": "00000040", - "tacDefault": "D84000A800", - "tacOnline": "DC4004F800", - "tacDenial": "0010000000", - "floorLimit": "000000000000", - "cvmLimit": 75000, - "transLimit": "999999999999", - "transLimitCDV": "999999999999", - "terminalCapability": "0000000000000000", - "riskManageData": "01", - "cateCode": "2701", - "currencyCode": "0104" - }, - { - "aidEnable": true, - "aid": "A0000000033010", - "cardScheme": "VISA", - "applicationVersion": "0030", - "emvDDOL": "9F3704", - "emvTDOL": "9F3704", - "partialAidSelection": false, - "targetPercent": "99", - "maxTargetPercent": "99", - "threshold": "00000040", - "tacDefault": "D84000A800", - "tacOnline": "DC4004F800", - "tacDenial": "0010000000", - "floorLimit": "000000000000", - "cvmLimit": 75000, - "transLimit": "999999999999", - "transLimitCDV": "999999999999", - "terminalCapability": "0000000000000000", - "riskManageData": "01", - "cateCode": "2701", - "currencyCode": "0104" - }, - { - "aidEnable": true, - "aid": "A0000000038010", - "cardScheme": "VISA", - "applicationVersion": "0030", - "emvDDOL": "9F3704", - "emvTDOL": "9F3704", - "partialAidSelection": false, - "targetPercent": "99", - "maxTargetPercent": "99", - "threshold": "00000040", - "tacDefault": "D84000A800", - "tacOnline": "DC4004F800", - "tacDenial": "0010000000", - "floorLimit": "000000000000", - "cvmLimit": 75000, - "transLimit": "999999999999", - "transLimitCDV": "999999999999", - "terminalCapability": "0000000000000000", - "riskManageData": "01", - "cateCode": "2701", - "currencyCode": "0104" - }, - { - "aidEnable": true, - "aid": "A000000003101008", - "cardScheme": "VISA", - "applicationVersion": "0030", - "emvDDOL": "9F3704", - "emvTDOL": "9F3704", - "partialAidSelection": false, - "targetPercent": "99", - "maxTargetPercent": "99", - "threshold": "00000040", - "tacDefault": "D84000A800", - "tacOnline": "DC4004F800", - "tacDenial": "0010000000", - "floorLimit": "000000000000", - "cvmLimit": 75000, - "transLimit": "999999999999", - "transLimitCDV": "999999999999", - "terminalCapability": "0000000000000000", - "riskManageData": "01", - "cateCode": "2701", - "currencyCode": "0104" - }, - { - "aidEnable": true, - "aid": "A000000003101009", + "aid": "A000000003", "cardScheme": "VISA", "applicationVersion": "0030", "emvDDOL": "9F3704", diff --git a/baselib/src/main/res/raw/paywave_config.json b/baselib/src/main/res/raw/paywave_config.json index a15cf97..d22dc90 100644 --- a/baselib/src/main/res/raw/paywave_config.json +++ b/baselib/src/main/res/raw/paywave_config.json @@ -2,132 +2,7 @@ { "aidEnable": true, - "aid": "A0000000031010", - "cardLabel": "VISA", - "applicationVersion": "0030", - "emvDDOL": "9F3704", - "emvTDOL": "9F3704", - "partialAidSelection": false, - "targetPercent": "00", - "maxTargetPercent": "00", - "threshold": "00000000", - "tacDefault": "DC4000A800", - "tacOnline": "DC4004F800", - "tacDenial": "0010000000", - "floorLimit": "000000000000", - "cvmLimit": 70000, - "transLimit": "999999999999", - "transLimitCDV": "999999999999", - "terminalCapability": "0000000000000000", - "riskManageData": "01", - "kernelType": "03", - "ttq": "32A04000", - "cateCode": "2701", - "currencyCode": "0104" - }, - { - "aidEnable": true, - "aid": "A0000000032010", - "cardLabel": "VISA", - "applicationVersion": "0030", - "emvDDOL": "9F3704", - "emvTDOL": "9F3704", - "partialAidSelection": false, - "targetPercent": "00", - "maxTargetPercent": "00", - "threshold": "00000000", - "tacDefault": "DC4000A800", - "tacOnline": "DC4004F800", - "tacDenial": "0010000000", - "floorLimit": "000000000000", - "cvmLimit": 70000, - "transLimit": "999999999999", - "transLimitCDV": "999999999999", - "terminalCapability": "0000000000000000", - "riskManageData": "01", - "kernelType": "03", - "ttq": "32A04000", - "cateCode": "2701", - "currencyCode": "0104" - }, - { - "aidEnable": true, - "aid": "A000000003101001", - "cardLabel": "VISA", - "applicationVersion": "0030", - "emvDDOL": "9F3704", - "emvTDOL": "9F3704", - "partialAidSelection": false, - "targetPercent": "00", - "maxTargetPercent": "00", - "threshold": "00000000", - "tacDefault": "DC4000A800", - "tacOnline": "DC4004F800", - "tacDenial": "0010000000", - "floorLimit": "000000000000", - "cvmLimit": 70000, - "transLimit": "999999999999", - "transLimitCDV": "999999999999", - "terminalCapability": "0000000000000000", - "riskManageData": "01", - "kernelType": "03", - "ttq": "32A04000", - "cateCode": "2701", - "currencyCode": "0104" - }, - { - "aidEnable": true, - "aid": "A000000003101002", - "cardLabel": "VISA", - "applicationVersion": "0030", - "emvDDOL": "9F3704", - "emvTDOL": "9F3704", - "partialAidSelection": false, - "targetPercent": "00", - "maxTargetPercent": "00", - "threshold": "00000000", - "tacDefault": "DC4000A800", - "tacOnline": "DC4004F800", - "tacDenial": "0010000000", - "floorLimit": "000000000000", - "cvmLimit": 70000, - "transLimit": "999999999999", - "transLimitCDV": "999999999999", - "terminalCapability": "0000000000000000", - "riskManageData": "01", - "kernelType": "03", - "ttq": "32A04000", - "cateCode": "2701", - "currencyCode": "0104" - }, - { - "aidEnable": true, - "aid": "A000000003101008", - "cardLabel": "VISA", - "applicationVersion": "0030", - "emvDDOL": "9F3704", - "emvTDOL": "9F3704", - "partialAidSelection": false, - "targetPercent": "00", - "maxTargetPercent": "00", - "threshold": "00000000", - "tacDefault": "DC4000A800", - "tacOnline": "DC4004F800", - "tacDenial": "0010000000", - "floorLimit": "000000000000", - "cvmLimit": 70000, - "transLimit": "999999999999", - "transLimitCDV": "999999999999", - "terminalCapability": "0000000000000000", - "riskManageData": "01", - "kernelType": "03", - "ttq": "32A04000", - "cateCode": "2701", - "currencyCode": "0104" - }, - { - "aidEnable": true, - "aid": "A000000003101009", + "aid": "A000000003", "cardLabel": "VISA", "applicationVersion": "0030", "emvDDOL": "9F3704", diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java index 9816503..c412c01 100644 --- a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java +++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java @@ -42,10 +42,10 @@ public class SystemParamsSettings implements Serializable { // private String tmsAddress = "https://tms.smile-mm.com"; // private String tmsAddress = "http://128.199.170.203"; - private String tmsAddress = "https://sirius-nest.utsmyanmar.com"; -// private String tmsAddress = "https://api-tms-uat.kbzbank.com:8443/sirius"; //for uat - private String ereceiptAddress = "https://receipt-nest.utsmyanmar.com"; //for on prime -// private String ereceiptAddress = "https://api-tms-uat.kbzbank.com:8443/receipt"; //for uat +// private String tmsAddress = "https://sirius-nest.utsmyanmar.com"; + private String tmsAddress = "https://api-tms-uat.kbzbank.com:8443/sirius"; //for uat +// private String ereceiptAddress = "https://receipt-nest.utsmyanmar.com"; //for on prime + private String ereceiptAddress = "https://api-tms-uat.kbzbank.com:8443/receipt"; //for uat private String binValues = "";