Kyaw_Min_Khant/KBZ-POS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/merge_latest_SIT' into merge_latest_SIT

Browse Source
This commit is contained in:
kizzy 2025-12-25 17:37:28 +07:00
commit 9a7f4a5245
5 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -14,8 +14,8 @@ android {
applicationId "com.utsmm.kbz" applicationId "com.utsmm.kbz"
minSdk 24 minSdk 24
targetSdk 33 targetSdk 33
versionCode 7 versionCode 8
versionName "1.06" versionName "1.07"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }

15
app/src/main/java/com/utsmm/kbz/MainActivity.java
View File

@ -399,7 +399,13 @@ public class MainActivity extends AppCompatActivity implements
} }
@Override
public void onStop(){
super.onStop();
BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar();
BaseApplication.getInstance().deviceEngine.getPlatform().enableHomeButton();
BaseApplication.getInstance().deviceEngine.getPlatform().enableTaskButton();
}
@Override @Override
protected void onNewIntent(Intent intent) { protected void onNewIntent(Intent intent) {
@ -466,13 +472,12 @@ public class MainActivity extends AppCompatActivity implements
@Override @Override
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();
BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar();
BaseApplication.getInstance().deviceEngine.getPlatform().enableHomeButton();
BaseApplication.getInstance().deviceEngine.getPlatform().enableTaskButton();
// Clean up RxJava disposables // Clean up RxJava disposables
compositeDisposable.clear(); compositeDisposable.clear();
// Reset screen mode // Reset screen mode
// Disconnect ECR // Disconnect ECR
ECRHelper.INSTANCE.disconnect(); ECRHelper.INSTANCE.disconnect();
} }

13
app/src/main/java/com/utsmm/kbz/MainFragment.java
View File

@ -111,7 +111,6 @@ public class MainFragment extends DataBindingFragment {
return routeId; return routeId;
} }
@Override @Override
protected void initViewModel() { protected void initViewModel() {
sharedViewModel = getFragmentScopeViewModel(SharedViewModel.class); sharedViewModel = getFragmentScopeViewModel(SharedViewModel.class);
@ -119,7 +118,6 @@ public class MainFragment extends DataBindingFragment {
tmsProcessViewModel = getFragmentScopeViewModel(TMSProcessViewModel.class); tmsProcessViewModel = getFragmentScopeViewModel(TMSProcessViewModel.class);
} }
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
@ -212,15 +210,18 @@ public class MainFragment extends DataBindingFragment {
@Override @Override
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();
// BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar();
// enableTaskButton();
// enableHomeButton();
} }
@Override @Override
public void onPause() { public void onPause() {
super.onPause(); super.onPause();
BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar(); // BaseApplication.getInstance().deviceEngine.getPlatform().showNavigationBar();
enableTaskButton(); // enableTaskButton();
enableHomeButton(); // enableHomeButton();
} }
@Override @Override

4
paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java
View File

@ -739,13 +739,11 @@ public abstract class BaseXPrint {
long refundTotal = 0; long refundTotal = 0;
for (PayDetail pay : lists) { for (PayDetail pay : lists) {
// printer.appendPrnStr("DATE :" + POSUtil.getInstance().formatDisplayDate(payDetail.getTransDate()), fontNormal, AlignEnum.LEFT, false);
// printer.appendPrnStr("TIME :" + payDetail.getTransTime(), fontNormal, AlignEnum.LEFT, false);
printString("Trans Id: " + pay.getQrTransId()); printString("Trans Id: " + pay.getQrTransId());
printString("Status : " + pay.getTC()); printString("Status : " + pay.getTC());
// printString("Date : " + PrintUtils.getInstance().formatTimestamp(Long.parseLong(pay.getTradeDateAndTime()))); // printString("Date : " + PrintUtils.getInstance().formatTimestamp(Long.parseLong(pay.getTradeDateAndTime())));
printString("Date : " + POSUtil.getInstance().formatDisplayDate(pay.getTradeDate())); printString("Date : " + pay.getTransDate());
printString("Time : " + pay.getTransTime()); printString("Time : " + pay.getTransTime());
printString("Amount : " + "MMK " + PrintUtils.getInstance().getSeparatorOnlyNumberFormat(pay.getAmount())); printString("Amount : " + "MMK " + PrintUtils.getInstance().getSeparatorOnlyNumberFormat(pay.getAmount()));

2
paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/PrintXImpl.java
View File

@ -212,7 +212,7 @@ public class PrintXImpl extends BaseXPrint implements PrintX {
setHeight(0x12); setHeight(0x12);
printLogo(); printLogo();
printMerchantHeader(); printMerchantHeader();
printTransHeader(payDetail); printTransHeader(payDetail, HostType.QR);
printQRSettlementTransDetail(list); printQRSettlementTransDetail(list);
printTransFooterSummary(); printTransFooterSummary();