From 58118a2fb5469fb33483248de8a55c6924e46821 Mon Sep 17 00:00:00 2001 From: MooN <56061215+MgKyawLay@users.noreply.github.com> Date: Tue, 13 Jan 2026 23:34:12 +0630 Subject: [PATCH] production ready --- .idea/deploymentTargetSelector.xml | 6 --- app/build.gradle | 30 +------------ .../main/java/com/utsmm/kbz/MainActivity.java | 24 ++++++---- .../main/java/com/utsmm/kbz/MainFragment.java | 6 +-- .../layout/fragment_print_receipt_screen.xml | 45 +++++++++++++++++-- .../utsmyanmar/baselib/di/NetworkModule.java | 22 ++++++--- .../baselib/network/KPayApiService.java | 4 +- .../interceptor/SiriusInterceptor.java | 2 +- .../utsmyanmar/baselib/repo/Repository.java | 4 +- .../paylibs/print/printx/BaseXPrint.java | 2 +- 10 files changed, 85 insertions(+), 60 deletions(-) diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index da6c8f6..a7ec23d 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -13,12 +13,6 @@ - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index a168be9..d6b3ef3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,34 +47,6 @@ android { } } -// defaultConfig { -// applicationId "com.utsmm.kbz.sit" -// minSdk 24 -// targetSdk 33 -// versionCode 1 -// versionName "1.0" -// -//// applicationId "com.utsmm.kbz" -//// versionName "1.10" -// -// testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" -// -//// // Add CMake configuration -//// externalNativeBuild { -//// cmake { -//// cppFlags "-std=c++14" -//// } -//// } -// } - - // Configure CMake -// externalNativeBuild { -// cmake { -// path "src/main/cpp/CMakeLists.txt" -// version "3.22.1" -// } -// } - buildTypes { release { minifyEnabled true @@ -82,7 +54,7 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } debug { - debuggable true + debuggable false } } compileOptions { diff --git a/app/src/main/java/com/utsmm/kbz/MainActivity.java b/app/src/main/java/com/utsmm/kbz/MainActivity.java index 350e7b4..6e32616 100644 --- a/app/src/main/java/com/utsmm/kbz/MainActivity.java +++ b/app/src/main/java/com/utsmm/kbz/MainActivity.java @@ -110,6 +110,8 @@ public class MainActivity extends AppCompatActivity implements public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar(); + // Keep screen on getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); @@ -147,7 +149,6 @@ public class MainActivity extends AppCompatActivity implements initKey(); } }, 500); - } private void initKey(){ @@ -426,15 +427,15 @@ public class MainActivity extends AppCompatActivity implements SystemParamsOperation.getInstance().setDownloadedParams(false); handleAutoSettlementIntent(getIntent()); - + BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar(); } @Override public void onStop(){ super.onStop(); - BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar(); - BaseApplication.getInstance().deviceEngine.getPlatform().enableHomeButton(); - BaseApplication.getInstance().deviceEngine.getPlatform().enableTaskButton(); +// BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar(); +// BaseApplication.getInstance().deviceEngine.getPlatform().enableHomeButton(); +// BaseApplication.getInstance().deviceEngine.getPlatform().enableTaskButton(); } @Override @@ -502,14 +503,15 @@ 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(); +// BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar(); +// BaseApplication.getInstance().deviceEngine.getPlatform().enableHomeButton(); +// BaseApplication.getInstance().deviceEngine.getPlatform().enableTaskButton(); // Clean up RxJava disposables compositeDisposable.clear(); // Reset screen mode // Disconnect ECR ECRHelper.INSTANCE.disconnect(); + BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar(); } // Navigation drawer interaction listeners @@ -520,6 +522,12 @@ public class MainActivity extends AppCompatActivity implements navController.navigate(R.id.inputPasswordFragment); } + @Override + public void onPause(){ + super.onPause(); + BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar(); + } + @Override public void onClickFunction() { closeDrawer(); diff --git a/app/src/main/java/com/utsmm/kbz/MainFragment.java b/app/src/main/java/com/utsmm/kbz/MainFragment.java index d6fcdc7..ee03da5 100644 --- a/app/src/main/java/com/utsmm/kbz/MainFragment.java +++ b/app/src/main/java/com/utsmm/kbz/MainFragment.java @@ -146,10 +146,10 @@ public class MainFragment extends DataBindingFragment { delayFunctionCall(() -> { NexGoSDK.getInstance().cancelCheckCard(); NexGoSDK.getInstance().closeReader(); - enableHomeButton(); - disableTaskButton(); +// enableHomeButton(); +// disableTaskButton(); // BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar(); - BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar(); +// BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar(); }); } diff --git a/app/src/main/res/layout/fragment_print_receipt_screen.xml b/app/src/main/res/layout/fragment_print_receipt_screen.xml index 5dcc23c..b751701 100644 --- a/app/src/main/res/layout/fragment_print_receipt_screen.xml +++ b/app/src/main/res/layout/fragment_print_receipt_screen.xml @@ -223,6 +223,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:maxLines="1" + android:ellipsize="end" + + tools:text="REF123456789123456789123456789012345" /> + 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 51102e2..7870b12 100644 --- a/baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java +++ b/baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java @@ -82,9 +82,6 @@ public class NetworkModule { public static native String getTMSUrlFromNative(); - public static String Refund_Base_Url = "https://api.kbzpay.com:18008/payment/gateway/uat/"; - - private static OkHttpClient getUnsafeOkHttpClient() { try { // Create a trust manager that does not validate certificate chains @@ -395,6 +392,21 @@ public Retrofit provideKPayRefundRetrofit(@ApplicationContext Context context) { // char[] password = "test123".toCharArray(); +// public static String Refund_Base_Url = "https://api.kbzpay.com:18008/payment/gateway/uat/"; + + + String refundBaseUrl = ""; + String IpAddress = SystemParamsOperation.getInstance().getSecHostIpAddress(); + + + if (IpAddress != null && !IpAddress.isEmpty()) { + refundBaseUrl = IpAddress; + } + + if (refundBaseUrl.isEmpty()) { + refundBaseUrl = "https://api.kbzpay.com/payment/gateway/"; + } + String pass = SystemParamsOperation.getInstance().getCertificatePassword(); if (TextUtils.isEmpty(pass)) { pass = "test123"; @@ -456,7 +468,7 @@ public Retrofit provideKPayRefundRetrofit(@ApplicationContext Context context) { .build(); return new Retrofit.Builder() - .baseUrl(Refund_Base_Url) + .baseUrl(refundBaseUrl) .client(okHttp) .addCallAdapterFactory(RxJava3CallAdapterFactory.create()) .addConverterFactory(GsonConverterFactory.create()) @@ -468,7 +480,7 @@ public Retrofit provideKPayRefundRetrofit(@ApplicationContext Context context) { // Provide fallback Retrofit to avoid crash, but no SSL return new Retrofit.Builder() - .baseUrl(Refund_Base_Url) + .baseUrl(refundBaseUrl) .client(new OkHttpClient()) .addCallAdapterFactory(RxJava3CallAdapterFactory.create()) .addConverterFactory(GsonConverterFactory.create()) diff --git a/baselib/src/main/java/com/utsmyanmar/baselib/network/KPayApiService.java b/baselib/src/main/java/com/utsmyanmar/baselib/network/KPayApiService.java index 7a22441..e73bf23 100644 --- a/baselib/src/main/java/com/utsmyanmar/baselib/network/KPayApiService.java +++ b/baselib/src/main/java/com/utsmyanmar/baselib/network/KPayApiService.java @@ -24,8 +24,8 @@ public interface KPayApiService { //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); + @POST("closeorder") + Observable closeOrder(@Body KPayQRRequest.CloseOrderRequest closeOrderRequest); //this 2 is for production diff --git a/baselib/src/main/java/com/utsmyanmar/baselib/network/interceptor/SiriusInterceptor.java b/baselib/src/main/java/com/utsmyanmar/baselib/network/interceptor/SiriusInterceptor.java index 7486d67..3cec79c 100644 --- a/baselib/src/main/java/com/utsmyanmar/baselib/network/interceptor/SiriusInterceptor.java +++ b/baselib/src/main/java/com/utsmyanmar/baselib/network/interceptor/SiriusInterceptor.java @@ -40,7 +40,7 @@ public class SiriusInterceptor implements Interceptor { // hashed = TerminalUtil.getInstance().generateHashedString(nonce); // old tms hashed = TerminalUtil.getInstance().generateHashedString(nonce).toLowerCase(); // new tms - LogUtil.d(TAG,"hashed :"+ hashed); +// LogUtil.d(TAG,"hashed :"+ hashed); } catch (NoSuchAlgorithmException e) { throw new RuntimeException(e); } 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 4654e73..9368257 100644 --- a/baselib/src/main/java/com/utsmyanmar/baselib/repo/Repository.java +++ b/baselib/src/main/java/com/utsmyanmar/baselib/repo/Repository.java @@ -86,8 +86,8 @@ public class Repository { } public Observable qrCloseOrder(KPayQRRequest.CloseOrderRequest request){ - String url = "https://api.kbzpay.com/payment/gateway/uat/closeorder"; //close this in prod - return kPayApiService.closeOrder(url, request); +// String url = "https://api.kbzpay.com/payment/gateway/uat/closeorder"; //close this in prod + return kPayApiService.closeOrder(request); // return kPayApiService.closeOrder(request); //this is for prod } diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java index a24aa96..05eaf78 100644 --- a/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java +++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java @@ -895,7 +895,7 @@ public abstract class BaseXPrint { dashBreak(); print2ColumnsString("Sale Total :MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(totalAmount)); dashBreak(); - print2ColumnsString("Sale Total :MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(totalAmount - refundTotal)); + print2ColumnsString("Grand Total :MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(totalAmount - refundTotal)); dashBreakEnding(); // emptyLine(2);