From ac07a5781de6bfe9179d0530cf668d58e40a4f46 Mon Sep 17 00:00:00 2001
From: moon <56061215+MgKyawLay@users.noreply.github.com>
Date: Thu, 4 Jun 2026 11:03:04 +0630
Subject: [PATCH] commit

---
 app/build.gradle                              |   4 ++--
 .../main/java/com/utsmm/kbz/MainActivity.java |  12 ++++++------
 .../main/java/com/utsmm/kbz/MainFragment.java |   3 +--
 .../ui/core_viewmodel/SharedViewModel.java    |  11 ++++++++++-
 .../baselineProfiles/0/app-uat-release.dm     | Bin 3262 -> 3260 bytes
 .../baselineProfiles/1/app-uat-release.dm     | Bin 3182 -> 3180 bytes
 app/uat/release/output-metadata.json          |   4 ++--
 .../paylibs/print/printx/BaseXPrint.java      |   4 ++++
 .../paylibs/print/printx/PrintXImpl.java      |   7 ++++---
 .../core_utils/SystemParamsSettings.java      |   4 ++--
 10 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ee44531..ba56202 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,8 +14,8 @@ android {
         applicationId "com.utsmm.kbz"
         minSdk 24
         targetSdk 33
-        versionCode 5
-        versionName "2.3"
+        versionCode 38
+        versionName "2.33"
         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 bfbf4a4..3281fd5 100644
--- a/app/src/main/java/com/utsmm/kbz/MainActivity.java
+++ b/app/src/main/java/com/utsmm/kbz/MainActivity.java
@@ -160,8 +160,8 @@ 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");
 
         PinPad pinPad = MyApplication.getInstance().deviceEngine.getPinPad();
         byte[] encryptedPIK = SystemParamsOperation.getInstance().getPIK();
@@ -442,8 +442,8 @@ public class MainActivity extends AppCompatActivity implements
     @Override
     public void onStop(){
         super.onStop();
-//        BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar();
-        BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar();
+        BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar();
+//        BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar();
     }
 
     @Override
@@ -581,8 +581,8 @@ public class MainActivity extends AppCompatActivity implements
     @Override
     public void onPause(){
         super.onPause();
-//        BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar();
-        BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar();
+        BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar();
+//        BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar();
     }
 
     @Override
diff --git a/app/src/main/java/com/utsmm/kbz/MainFragment.java b/app/src/main/java/com/utsmm/kbz/MainFragment.java
index 9d157b3..31cd912 100644
--- a/app/src/main/java/com/utsmm/kbz/MainFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/MainFragment.java
@@ -135,8 +135,7 @@ public class MainFragment extends DataBindingFragment {
     @Override
     public void onResume() {
         super.onResume();
-        int result = BaseApplication.getInstance().deviceEngine.getPlatform().disableControlBar();
-        LogUtil.d(TAG, "control bar result " + result);
+        BaseApplication.getInstance().deviceEngine.getPlatform().enableControlBar();
 
         setNavBarIconWithTitle(getResourceString(R.string.menu_dashboard));
 
diff --git a/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/SharedViewModel.java b/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/SharedViewModel.java
index d2b5e45..15b3a84 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/SharedViewModel.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/SharedViewModel.java
@@ -2,6 +2,7 @@ package com.utsmm.kbz.ui.core_viewmodel;
 
 import android.annotation.SuppressLint;
 import android.graphics.Bitmap;
+import android.os.Looper;
 import android.util.Log;
 import android.widget.ListView;
 
@@ -231,7 +232,15 @@ public class SharedViewModel extends ViewModel {
 
     public void setPrintReceiptMsg(String msg) { this.printReceiptMsg.setValue(msg);}
     public void postPrintReceiptMsg(String msg) { this.printReceiptMsg.postValue(msg);}
-    public void setPrintStatus(PrintStatus printStatus) { this.printStatus.postValue(printStatus); }
+    public void setPrintStatus(PrintStatus printStatus) { 
+//        this.printStatus.postValue(printStatus); 
+        if (Looper.myLooper() == Looper.getMainLooper()) {
+            this.printStatus.setValue(printStatus);
+        } else {
+            this.printStatus.postValue(printStatus);
+        }
+
+    }
     public void postPrintStatus(PrintStatus printStatus) { this.printStatus.postValue(printStatus); }
 
     public SingleLiveEvent<PrintStatus> getPrintStatus() { return this.printStatus; }
diff --git a/app/uat/release/baselineProfiles/0/app-uat-release.dm b/app/uat/release/baselineProfiles/0/app-uat-release.dm
index a76f01b9645e463e22bc2f071e8d82be3382d06c..e950059e72194f268d903e5d4d45effb3c53daee 100644
GIT binary patch
delta 2810
zcmZvecTm%b633%(1R;XhNB{{O0v3v(CIL+-KJZS|(3AjyP=bIMsRyC{Kon3AE<^;S
zDdh-7dXp|eiZsz2V1Q6U6$k`EZ%^Ocd(WHqc4lY)*x8xgo!R|<>R>gngN6ot{6|58
zf`XvmT<Mg9(tKG$IEu<e5%&WikXsZ8v>!xnBS0zc#|{KIbp_3y1%YZPF#~{;RNpbo
zd5Jf-W0ec+H7JjWG37UNatdzcHRZTe%UM1?X4lt<y6|u$Z=$p<RYJ$oZNTO!T<8z1
z(KX{GHzG3OkdTosZ6_DfXegw1fOP8q6|Te;AmgaiAVRH}o#J{i)vKgu?6`cHZg<0w
zKSyKOchHs7#kuUQC(TqaRxAf#e9ggXHW29duvl+zvnWf!C*Y5|A{=cECuj<S*%GXI
zhg++emqd?^e^HJldoRkKe(9Cx9+*1G&2V{}v~$QqU#(EVsYi!#u6$-S>8L=Jf#@$r
z7Tb-Qy3FFU%kJZjW><PnUSw@J$#lt6BM;C%iC)8w{Hh)RSedNX0(OoDL!vIVBm>KU
z$0a&SoweDP__I3BhK*hco#Vpo@gn>%ty?&sbSShc_u`oD1Z%Oza9lLJcDTZOyte?g
zo>wYzzu)+7M6c`pWiZupn_EO~KTOdBpI@p{;uL6X1)jc{d>6Xn`Xn6d{Ch_hGu51;
zg$!`LKVLRvAjA>_e)YH#%TN;bdVVCH5Hxre9q6cByo0Z~cf;tB*B12*m6F|3j;t-+
zsoP>^lulOGAxCbr%8QLp$d@VCGph+iwx^jY0WHz0M|nU5ZM|3B3-|+)>g%i1JOUF>
zv$%nJ<E`5{a{Zh@)IR$L=#Rms4ubC~0ptfT8<38q2o^1SdL#F~9wDu@TA7kmI&#KD
z<eFn-J=4?0<FX*{A@0F1tOz#x!7{7RG)4Q|hLZ_zR(Qo@yThge9^bubP!V0=_H#nz
zIq0c3J(}J@ipu&0qsM?}GbyglJpubo^UFTqfcL+}-ElrhnfS9ppV`HrEfQ&}KoMf7
zD`zZIhI5LzGvV<5@j^7q>Ud7gph_`)Rw#XVqi3bq?6J+=zcn9%Me(ug#b7aG%is@+
zs-LN+tr-~W*r$zN9+_<t0R#vUt7QY<=0Im*Mo$vcBd?-cs^(s?Xx-pT)x^f0+m%lP
z<pz`~O`W6D0NwWTWyG^>lfwmvAV6XRYj872<IuRkD<^7{maolq&9R<a{H8N44uspT
zwA555KZVV!>bUi`&ZoO38@A|p%a?HlKAd#RbRyN>qLKI9l0lgJfW4qpHLCa~Z(*-o
zYbP{irsSSOus?lmrF`r0=1a4M{-d1g^XneN%&E0{U{Bw_W`WDHxx8y<#VFbu)TcbB
zN7kl?_nv6GUURmsS}s@Ou37uWPUS|>T9vAm=FaXV>_h(oE1Wsc(|XX|Vyqy!!8w5Y
zsTDgLTL!r5mf!5|b~t?O(|nwFU?P62Zz5fk<Hva~?l13~G2GsX30bn<klwt2xUZD7
z(|(KsoR!Q{xj~}E$7aPmReCT#*4lPDslW4n=-NYv_nb<jZC-6yMKbBXH~QD9+CTyr
zkQ$%b&(krQuitOspufPocX4)mS9RC|4YAr|{lgOeKh;L&PZf>M!Ir$9ISvPnd@SG0
zOF7h@hHFMIRHP6+4kzb_18D#C<W=&*Y;N%m7B0y=Gm&a^a!tQ7*=3;7PR92iv%aJA
zrL+f}&ED158_%KLirVB8Q+;l)Gfn)`a9dZg*0X^^^*+10sdX9R7Zpv5a;*{Ko;u>C
z#Vf}2n0DQ`_;9_HH6ML$_g!|OP!j|BFa(KYJKB9dXqGx8u+zx|+*)-)4`K!1LZ{)^
zf5Ry(9{4Pc>X$4d_2_HaK*8#BXUj&_5O`yL5j2y;tji>2mwPe`5i^nY8#~P4Ea`Z0
z_lNK0b=PGu5_8WeU<@=JFp->(dL-?OTBr#Pi6+~~q`w18$smagU8$)@FKw^bqo0|J
zi%fl#MO21B0H8OLYn3gn?(wrY5wYF~#y3Q3;(g1aA3I=14B-LJp(6I{_N?E<z}^hD
zo#R&%IU@c;rU;4=vBFR2i%~CZ;tL&|?)kkWmQOqsx+pK&@F`xiKU?wmvcpXuf*Nux
z?asOmIKL1(as{$<?^Bqx-yFa}PU9q33#`3Tv&D9SC}F8(IRRd&4i<)5pLm9!PM~6<
z_MuUsb=U#3QrmnQ@B-0qr9|X_eFCewvT}-Uw2&IzZgK=449YYLjkLA;NC9l{QtY1Y
zWG%0zP{$?hJj+m*D>nvxS`9AyH}Qwf9#^-!WhYir+-qqXj!HN$F@GaFMFS^^QV5$3
z2JF{%^t5=TCN1orR_2_qE_A`Y5giBB{X4|ULg3R-dfZH|s8Cl&oW_XorJc$JwaKI}
zatdF^5-`)SbahqIqR!k0-?zSl<T!P<y6AjAJnG#=y`WM0%aBoSa$P^b(<5zobx3)3
z9wB$_L)n?bW7;}GQlL%g9VwcOPZTEbnqD&)_@wM9?ow%yO0#x>&%&M6*NFphRyDcd
z9SQj<<gdZ*?n&q88_YJ(AxMAvc?ey`?7^t$<^ADds1g1xKkdXsM>EYZ5mdfdK4}{2
zqw?Zygl#ulwPkv$(RixaJ1}QMhtQd293$m~boR7oe=(1GYmK2sn;*G1E~*B=;%hDW
z0vBofi*UmXz``MapWAgvbTY2m$4Qd8{BCp5!pirJ=I9Il=JmYI#%O%Pk!a6CcY-b!
zc9DyY@vU&alyQ(e2})VMgYO?gL67jEJz@!r;Qj<jc4Kt2)Z!xuyaQhAa<$_oiCjQM
zPTJpy`Ux0OyMtN%s3y*B0MZahX>L?#(#O|5aP$;UBMuhhI~u8B+N}8pu@cwX5o#~C
zT#4pNGDKkACtvxv*h;UJq*=$2gSYQKag=Uu&y^0sfq5-VZMwy)X!Q1}634u^e!XBx
z;-+bDh{01HSin0dpO=ByJlwJXm!jV!1U<K@=avX@Kb})qT|NWQ;TzEUVuamWf#4Rr
zN=6VAnWbJd5~JP=YKiDvFHFD582|N6kd>Z8`Cp`<BqQ*ZXE)U3GJwT+V=IGmijDtA
z+rBH^ByprQ$-+e92fq0JyZUTF$N<v$f9oL-6><gwVegT4y&cBiC?;|XssHcULHUGV
zgh1=vi#z|Op$*V=S6BlO(O>=wipt!x49<dmTt^;~T2>{vO@(QhJ7OXJ(;@7H;#mVp
zzpta=@Y+3Y;%BYwg#p<mS5SrQn4y#bSkP{m1<w-#fwI2&-zbi{B4h`s%s9U=AK2y*
z{dspL(OQz^hOK<(0g|O_`BoonF?5gdPL}<_7K%ucmV8FGMa(2T%v(~smZp|s_zEFF
zk5=Yf@Hh!+7h(0Wzlfr4R~33*=Ti2HQ+Pd|+A*k66^FKH;pV1{j!Y+7M-?pWb-t-k
zXS#fapGFkz^92Gz6iA{6(`2&lj*YkOpIxZ`S#i}ns6C0nlJh$8T-C$tE6l}W(?p5e
zKh*4h-Vf7_Ic<<5Fm?Tr>liZch5ux(DOY%EldiQZ>$X3(RouYv+qiC5shC6iKp^37
uZfLM?|54C?uoeH~Dj=ZmM!f|&Dfo?O@!!j+A&}$yCaDP!83DC_rT+=e)nuUn

delta 2812
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
Ag8%>k

diff --git a/app/uat/release/baselineProfiles/1/app-uat-release.dm b/app/uat/release/baselineProfiles/1/app-uat-release.dm
index 2dffc85d2b1a2c6fec1940451bc7f9ab3fa97c5e..9bab694a95b21120d704adee4a00824b19207fe6 100644
GIT binary patch
literal 3180
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

delta 3000
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

diff --git a/app/uat/release/output-metadata.json b/app/uat/release/output-metadata.json
index b498057..6732156 100644
--- a/app/uat/release/output-metadata.json
+++ b/app/uat/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 33,
-      "versionName": "2.13-uat",
+      "versionCode": 38,
+      "versionName": "2.33-uat",
       "outputFile": "app-uat-release.apk"
     }
   ],
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 1eb0046..aa775ed 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
@@ -391,6 +391,10 @@ public abstract class BaseXPrint {
 
     }
 
+    protected void printTransFooterForSettlement() {
+        printer.appendPrnStr("*****SETTLEMENT CONFIRM*****", fontNormal, AlignEnum.CENTER,false);
+    }
+
     protected void printTransDetail(PayDetail payDetail) {
 
 
diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/PrintXImpl.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/PrintXImpl.java
index 4acbb91..32692b2 100644
--- a/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/PrintXImpl.java
+++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/PrintXImpl.java
@@ -193,7 +193,8 @@ public class PrintXImpl extends BaseXPrint implements PrintX {
             printMerchantHeader();
             printTransHeader(payDetail);
             printTransDetailSettlement(payDetail);
-            printTransFooterSummary();
+//            printTransFooterSummary();
+            printTransFooterForSettlement();
 
             emptyLine(1);
             startPrintNex();
@@ -214,8 +215,8 @@ public class PrintXImpl extends BaseXPrint implements PrintX {
             printMerchantHeader();
             printTransHeader(payDetail, HostType.QR);
             printQRSettlementTransDetail(list);
-            printTransFooterSummary();
-
+//            printTransFooterSummary();
+            printTransFooterForSettlement();
             emptyLine(1);
             startPrintNex();
         } catch (RemoteException e) {
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 c845781..ce54334 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
@@ -40,8 +40,8 @@ public class SystemParamsSettings implements Serializable {
 
     private boolean checkExpSwitch = false;
     
-    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 binValues = "";
     private String restrictedBinValues = "";