commit

app/build.gradle

@@ -14,8 +14,8 @@ android {
         applicationId "com.utsmm.kbz"
         minSdk 24
         targetSdk 33
-        versionCode 5
+        versionCode 38
-        versionName "2.3"
+        versionName "2.33"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 

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().setTmsAddress("https://api-tms-uat.kbzbank.com:8443/sirius");
-        SystemParamsOperation.getInstance().setEReceiptAddress("https://api-tms.kbzbank.com/receipt");
+        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().showNavigationBar();
-        BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar();
+//        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().showNavigationBar();
-        BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar();
+//        BaseApplication.getInstance().deviceEngine.getPlatform().hideNavigationBar();
     }
 
     @Override

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();
+        BaseApplication.getInstance().deviceEngine.getPlatform().enableControlBar();
-        LogUtil.d(TAG, "control bar result " + result);
 
         setNavBarIconWithTitle(getResourceString(R.string.menu_dashboard));
 

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; }

app/uat/release/output-metadata.json

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 33,
+      "versionCode": 38,
-      "versionName": "2.13-uat",
+      "versionName": "2.33-uat",
       "outputFile": "app-uat-release.apk"
     }
   ],

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) {
 
 

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) {

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 tmsAddress = "https://api-tms-uat.kbzbank.com:8443/sirius";
-    private String ereceiptAddress = "https://api-tms.kbzbank.com/receipt";
+    private String ereceiptAddress = "https://api-tms-uat.kbzbank.com:8443/receipt";
 
     private String binValues = "";
     private String restrictedBinValues = "";