diff --git a/app/build.gradle b/app/build.gradle index 423130c..573b8ec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,8 +14,8 @@ android { applicationId "com.utsmm.kbz" minSdk 24 targetSdk 33 - versionCode 39 - versionName "2.34" + versionCode 41 + versionName "2.36" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/utsmm/kbz/MainActivity.java b/app/src/main/java/com/utsmm/kbz/MainActivity.java index 9064cf4..7afa01f 100644 --- a/app/src/main/java/com/utsmm/kbz/MainActivity.java +++ b/app/src/main/java/com/utsmm/kbz/MainActivity.java @@ -158,10 +158,10 @@ public class MainActivity extends AppCompatActivity implements private void initKey(){ // SystemParamsOperation.getInstance().setTmsAddress("https://api-tms.kbzbank.com/sirius"); // SystemParamsOperation.getInstance().setEReceiptAddress("https://api-tms.kbzbank.com/receipt"); - SystemParamsOperation.getInstance().setTmsAddress("https://api-tms-uat.kbzbank.com:8443/sirius"); - SystemParamsOperation.getInstance().setEReceiptAddress("https://api-tms-uat.kbzbank.com:8443/receipt"); -// SystemParamsOperation.getInstance().setTmsAddress("https://sirius-nest.utsmyanmar.com/api/v1"); -// SystemParamsOperation.getInstance().setEReceiptAddress("https://receipt-nest.utsmyanmar.com"); +// SystemParamsOperation.getInstance().setTmsAddress("https://api-tms-uat.kbzbank.com:8443/sirius"); +// SystemParamsOperation.getInstance().setEReceiptAddress("https://api-tms-uat.kbzbank.com:8443/receipt"); + SystemParamsOperation.getInstance().setTmsAddress("https://sirius-nest.utsmyanmar.com/api/v1"); + SystemParamsOperation.getInstance().setEReceiptAddress("https://receipt-nest.utsmyanmar.com"); PinPad pinPad = MyApplication.getInstance().deviceEngine.getPinPad(); byte[] encryptedPIK = SystemParamsOperation.getInstance().getPIK(); diff --git a/app/uat/release/baselineProfiles/0/app-uat-release.dm b/app/uat/release/baselineProfiles/0/app-uat-release.dm index 5481780..66eeec0 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 a7384c0..2aa28fa 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 9278567..0dfff20 100644 --- a/app/uat/release/output-metadata.json +++ b/app/uat/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 39, - "versionName": "2.34-uat", + "versionCode": 41, + "versionName": "2.36-uat", "outputFile": "app-uat-release.apk" } ], diff --git a/baselib/src/main/java/com/utsmyanmar/baselib/di/DatabaseModule.java b/baselib/src/main/java/com/utsmyanmar/baselib/di/DatabaseModule.java index 77a9efa..3cd6b3a 100644 --- a/baselib/src/main/java/com/utsmyanmar/baselib/di/DatabaseModule.java +++ b/baselib/src/main/java/com/utsmyanmar/baselib/di/DatabaseModule.java @@ -327,11 +327,11 @@ public class DatabaseModule { } }; - static final Migration MIGRATION_13_14 = new Migration(14, 15) { + static final Migration MIGRATION_13_14 = new Migration(13, 14) { @Override public void migrate(SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE paydetail " - + " ADD COLUMN eSignBlob BLOB"); + database.execSQL("ALTER TABLE paydetail ADD COLUMN eSignBlob BLOB"); + database.execSQL("ALTER TABLE paydetail ADD COLUMN eSignBase64 TEXT"); } }; 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 2085155..77c03c3 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://api-tms.kbzbank.com/sirius"; // private String ereceiptAddress = "https://api-tms.kbzbank.com/receipt"; - private String tmsAddress = "https://api-tms-uat.kbzbank.com:8443/sirius"; - private String ereceiptAddress = "https://api-tms-uat.kbzbank.com:8443/receipt"; -// private String tmsAddress = "https://sirius-nest.utsmyanmar.com/api/v1"; -// private String ereceiptAddress = "https://receipt-nest.utsmyanmar.com"; +// private String tmsAddress = "https://api-tms-uat.kbzbank.com:8443/sirius"; +// private String ereceiptAddress = "https://api-tms-uat.kbzbank.com:8443/receipt"; + private String tmsAddress = "https://sirius-nest.utsmyanmar.com/api/v1"; + private String ereceiptAddress = "https://receipt-nest.utsmyanmar.com"; private String binValues = ""; private String restrictedBinValues = "";