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

This commit is contained in:
kizzy 2026-03-04 14:34:16 +07:00
commit b808a87f23
2 changed files with 9 additions and 10 deletions

Binary file not shown.

View File

@ -122,7 +122,7 @@ public abstract class BaseXPrint {
returnText[1] = 0x33; returnText[1] = 0x33;
returnText[2] = (byte) height; returnText[2] = (byte) height;
Resources resources = PayLibNex.getInstance().context.getResources(); Resources resources = PayLibNex.getInstance().context.getResources();
printer.setTypeface(Typeface.createFromAsset(PayLibNex.getInstance().context.getAssets(), "fonts/fira_code_medium.ttf")); printer.setTypeface(Typeface.createFromAsset(PayLibNex.getInstance().context.getAssets(), "fonts/firaCode_bold.ttf"));
printer.setGray(getGrayLevel()); printer.setGray(getGrayLevel());
} }
@ -449,12 +449,11 @@ public abstract class BaseXPrint {
printer.appendPrnStr("BTH NO:" + batchNum + " TRACE NO:" + traceNo, fontNormal, AlignEnum.LEFT,false); printer.appendPrnStr("BTH NO:" + batchNum + " TRACE NO:" + traceNo, fontNormal, AlignEnum.LEFT,false);
} }
// printer.appendPrnStr("\n", fontNormal, AlignEnum.LEFT,false);
printer.appendPrnStr("\n", fontNormal, AlignEnum.LEFT,false);
printer.appendPrnStr("\n", fontNormal, AlignEnum.LEFT,false); printer.appendPrnStr("\n", fontNormal, AlignEnum.LEFT,false);
printer.appendPrnStr(transType.replace("_", " "), fontNormal, AlignEnum.CENTER,true); printer.appendPrnStr(transType.replace("_", " "), fontNormal, AlignEnum.CENTER,true);
printer.appendPrnStr("\n", fontNormal, AlignEnum.LEFT,false); // printer.appendPrnStr("\n", fontNormal, AlignEnum.LEFT,false);
printer.appendPrnStr("\n", fontNormal, AlignEnum.LEFT,false); // printer.appendPrnStr("\n", fontNormal, AlignEnum.LEFT,false);
} }
@ -516,7 +515,7 @@ public abstract class BaseXPrint {
print2ColumnsStringNoSpace("AID :", payDetail.getAID()); print2ColumnsStringNoSpace("AID :", payDetail.getAID());
lineBreak(); dotBreak();
// check is pin change // check is pin change
if (payDetail.getTradeAnswerCode().equals("00") || payDetail.getTradeAnswerCode().equals("000")) { if (payDetail.getTradeAnswerCode().equals("00") || payDetail.getTradeAnswerCode().equals("000")) {
@ -525,17 +524,17 @@ public abstract class BaseXPrint {
if (payDetail.getTransactionType() == TransactionType.BALANCE_INQUIRY) { if (payDetail.getTransactionType() == TransactionType.BALANCE_INQUIRY) {
printer.appendPrnStr("MMK " + PrintUtils.getInstance().getBalanceInquiryNumberFormat(payDetail.getAmount()), fontNormal, AlignEnum.LEFT,true); printer.appendPrnStr("MMK " + PrintUtils.getInstance().getBalanceInquiryNumberFormat(payDetail.getAmount()), fontNormal, AlignEnum.LEFT,true);
} else { } else {
print2SideString("AMOUNT:" + currencySign, PrintUtils.getInstance().getSeparatorNumberFormat(payDetail.getAmount())); print2SideString("AMT:" + currencySign, PrintUtils.getInstance().getSeparatorNumberFormat(payDetail.getAmount()));
// printer.appendPrnStr("AMOUNT:" + currencySign + " " + PrintUtils.getInstance().getSeparatorNumberFormat(payDetail.getAmount()), fontNormal, AlignEnum.LEFT,true); // printer.appendPrnStr("AMOUNT:" + currencySign + " " + PrintUtils.getInstance().getSeparatorNumberFormat(payDetail.getAmount()), fontNormal, AlignEnum.LEFT,true);
} }
lineBreak(); dotBreak();
} else { } else {
// lineBreak(); // lineBreak();
emptyLine(1); emptyLine(1);
printer.appendPrnStr(BaseErrorCode.getCode(payDetail.getTradeAnswerCode()), fontNormal, AlignEnum.CENTER,true); printer.appendPrnStr(BaseErrorCode.getCode(payDetail.getTradeAnswerCode()), fontNormal, AlignEnum.CENTER,true);
emptyLine(1); emptyLine(1);
lineBreak(); dotBreak();
} }
emptyLine(1); emptyLine(1);
@ -777,7 +776,7 @@ public abstract class BaseXPrint {
} }
protected void dotBreak(){ protected void dotBreak(){
printer.appendPrnStr(new String(new char[29]).replace("\0", "."), fontNormal, AlignEnum.LEFT, false); printer.appendPrnStr(new String(new char[29]).replace("\0", "."), fontNormal, AlignEnum.CENTER, false);
} }
protected void printTransDetailReport(List<PayDetail> lists, HostType hostType) { protected void printTransDetailReport(List<PayDetail> lists, HostType hostType) {