diff --git a/app/build.gradle b/app/build.gradle index 3efa929..f57d89d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,8 +14,8 @@ android { applicationId "com.utsmm.kbz" minSdk 24 targetSdk 33 - versionCode 32 - versionName "2.12" + versionCode 2 + versionName "2.0" 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 7776103..ea2f59d 100644 --- a/app/src/main/java/com/utsmm/kbz/MainActivity.java +++ b/app/src/main/java/com/utsmm/kbz/MainActivity.java @@ -116,8 +116,8 @@ public class MainActivity extends AppCompatActivity implements public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); -// BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar(); - BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar(); + BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar(); +// BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar(); // Keep screen on getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); @@ -160,10 +160,8 @@ 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/api/v1"); -// SystemParamsOperation.getInstance().setEReceiptAddress("https://api-tms-uat.kbzbank.com:8443/receipt"); - SystemParamsOperation.getInstance().setEReceiptAddress("https://receipt-nest.utsmyanmar.com/api/v1"); + SystemParamsOperation.getInstance().setTmsAddress("https://api-tms.kbzbank.com/sirius"); + SystemParamsOperation.getInstance().setEReceiptAddress("https://api-tms.kbzbank.com/receipt"); PinPad pinPad = MyApplication.getInstance().deviceEngine.getPinPad(); byte[] encryptedPIK = SystemParamsOperation.getInstance().getPIK(); @@ -436,16 +434,14 @@ public class MainActivity extends AppCompatActivity implements SystemParamsOperation.getInstance().setDownloadedParams(false); handleAutoSettlementIntent(getIntent()); -// BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar(); - BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar(); + BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar(); +// BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar(); } @Override public void onStop(){ super.onStop(); BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar(); -// BaseApplication.getInstance().deviceEngine.getPlatform().enableHomeButton(); -// BaseApplication.getInstance().deviceEngine.getPlatform().enableTaskButton(); } @Override @@ -563,9 +559,6 @@ public class MainActivity extends AppCompatActivity implements @Override public void onDestroy() { super.onDestroy(); -// BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar(); -// BaseApplication.getInstance().deviceEngine.getPlatform().enableHomeButton(); -// BaseApplication.getInstance().deviceEngine.getPlatform().enableTaskButton(); // Clean up RxJava disposables compositeDisposable.clear(); // Reset screen mode diff --git a/app/src/main/java/com/utsmm/kbz/MainFragment.java b/app/src/main/java/com/utsmm/kbz/MainFragment.java index 4d7d56b..3651273 100644 --- a/app/src/main/java/com/utsmm/kbz/MainFragment.java +++ b/app/src/main/java/com/utsmm/kbz/MainFragment.java @@ -160,18 +160,10 @@ public class MainFragment extends DataBindingFragment { NexGoSDK.getInstance().cancelCheckCard(); NexGoSDK.getInstance().closeReader(); enableHomeButton(); -// enablePinPadSound(false); -// disableTaskButton(); -// BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar(); -// BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar(); + }); } - -// private void enablePinPadSound(boolean flag) {n -// int result = BaseApplication.getInstance().deviceEngine.getPlatform().enablePinpadBeep(flag); -// LogUtil.d(TAG, "Pin Pad Beep Result:" + result); -// } - + private void disableHomeButton() { int result = BaseApplication.getInstance().deviceEngine.getPlatform().disableHomeButton(); LogUtil.d(TAG, "Disable Home Button Result:" + result); 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 136ab3f..009c5ea 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,7 @@ 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() + "/file/download?filePath="; String certUrl = SystemParamsOperation.getInstance().getCertificateUrl(); String clientCertUrl = SystemParamsOperation.getInstance().getCertificateClientUrl(); diff --git a/app/src/main/res/layout/fragment_capture_card_screen.xml b/app/src/main/res/layout/fragment_capture_card_screen.xml index 72c9d20..3445f63 100644 --- a/app/src/main/res/layout/fragment_capture_card_screen.xml +++ b/app/src/main/res/layout/fragment_capture_card_screen.xml @@ -142,6 +142,7 @@ android:weightSum="3"> + checkStatus(@Body KPayQRQueryRequest.QRQueryRequest waveStatusRequest); - //this accept "url" bez this api start with https and other are http in uat - @POST - Observable closeOrder(@Url String url, @Body KPayQRRequest.CloseOrderRequest closeOrderRequest); + //this accepts "url" bez this api start with https and other are http in uat +// @POST +// Observable closeOrder(@Url String url, @Body KPayQRRequest.CloseOrderRequest closeOrderRequest); //this 2 is for production -// @POST("closeorder") -// Observable closeOrder(@Body KPayQRRequest.CloseOrderRequest closeOrderRequest); + @POST("closeorder") + Observable closeOrder(@Body KPayQRRequest.CloseOrderRequest closeOrderRequest); } diff --git a/baselib/src/main/java/com/utsmyanmar/baselib/repo/Repository.java b/baselib/src/main/java/com/utsmyanmar/baselib/repo/Repository.java index f1de488..011203c 100644 --- a/baselib/src/main/java/com/utsmyanmar/baselib/repo/Repository.java +++ b/baselib/src/main/java/com/utsmyanmar/baselib/repo/Repository.java @@ -86,9 +86,9 @@ public class Repository { } public Observable qrCloseOrder(KPayQRRequest.CloseOrderRequest request){ - String url = "https://api-uat.kbzpay.com/payment/gateway/uat/closeorder"; //close this in prod - return kPayApiService.closeOrder(url, request); // this is for local -// return kPayApiService.closeOrder(request); //this is for prod +// String url = "https://api-uat.kbzpay.com/payment/gateway/uat/closeorder"; //close this in prod +// return kPayApiService.closeOrder(url, request); // this is for uat + return kPayApiService.closeOrder(request); //this is for prod } public Observable qrStatusCheck(KPayQRQueryRequest.QRQueryRequest request) { 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 5e4fb19..a1a5e22 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 @@ -39,13 +39,9 @@ public class SystemParamsSettings implements Serializable { private boolean manualEntryPinEnable = false; private boolean checkExpSwitch = false; - -// private String tmsAddress = "https://tms.smile-mm.com"; -// private String tmsAddress = "http://128.199.170.203"; - private String tmsAddress = "https://sirius-nest.utsmyanmar.com/api/v1"; -// private String tmsAddress = "https://api-tms-uat.kbzbank.com:8443/sirius"; //for uat - private String ereceiptAddress = "https://receipt-nest.utsmyanmar.com/api/v1"; //for on prime -// private String ereceiptAddress = "https://api-tms-uat.kbzbank.com:8443/receipt"; //for uat + + private String tmsAddress = "https://api-tms.kbzbank.com/sirius"; + private String ereceiptAddress = "https://api-tms.kbzbank.com/receipt"; private String binValues = "";