diff --git a/app/build.gradle b/app/build.gradle index 5702ca0..5bdae75 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,8 +14,8 @@ android { applicationId "com.utsmm.kbz" minSdk 24 targetSdk 33 - versionCode 9 - versionName "1.08" + versionCode 11 + versionName "1.10" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/paylibs/src/main/assets/fonts/fira_code.ttf b/paylibs/src/main/assets/fonts/fira_code.ttf deleted file mode 100644 index d7077f1..0000000 Binary files a/paylibs/src/main/assets/fonts/fira_code.ttf and /dev/null differ diff --git a/paylibs/src/main/assets/fonts/fira_code_bold.ttf b/paylibs/src/main/assets/fonts/fira_code_bold.ttf deleted file mode 100644 index 82a931f..0000000 Binary files a/paylibs/src/main/assets/fonts/fira_code_bold.ttf and /dev/null differ diff --git a/paylibs/src/main/assets/fonts/fira_code_medium.ttf b/paylibs/src/main/assets/fonts/fira_code_medium.ttf new file mode 100644 index 0000000..96efc66 Binary files /dev/null and b/paylibs/src/main/assets/fonts/fira_code_medium.ttf differ diff --git a/paylibs/src/main/assets/fonts/fira_code_semibold.ttf b/paylibs/src/main/assets/fonts/fira_code_semibold.ttf deleted file mode 100644 index ae619e9..0000000 Binary files a/paylibs/src/main/assets/fonts/fira_code_semibold.ttf and /dev/null differ 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 491b775..6edd129 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 @@ -89,7 +89,7 @@ public abstract class BaseXPrint { // protected FontEntity fontSmall = new FontEntity(DotMatrixFontEnum.CH_SONG_20X20, DotMatrixFontEnum.ASC_SONG_8X16); protected int fontNormal = 21; - protected int fontLarge = 22; + protected int fontLarge = 26; // protected FontEntity fontNormal = new FontEntity(DotMatrixFontEnum.CH_SONG_24X24, DotMatrixFontEnum.ASC_SONG_12X24); protected FontEntity fontBold = new FontEntity(DotMatrixFontEnum.CH_SONG_24X24, DotMatrixFontEnum.ASC_SONG_BOLD_16X24); @@ -123,7 +123,7 @@ public abstract class BaseXPrint { // Typeface typeface = ResourcesCompat.getFont(PayLibsUtils.getInstance().context, R.font.consolas); // printer.setTypeface(typeface); // printer.setTypeface(Typeface.createFromAsset(PayLibsUtils.getInstance().context.getAssets(), "fonts/firacode_regular.ttf")); - printer.setTypeface(Typeface.createFromAsset(PayLibsUtils.getInstance().context.getAssets(), "fonts/fira_code_semibold.ttf")); + printer.setTypeface(Typeface.createFromAsset(PayLibsUtils.getInstance().context.getAssets(), "fonts/fira_code_medium.ttf")); printer.setGray(getGrayLevel()); } @@ -628,6 +628,10 @@ public abstract class BaseXPrint { printer.appendPrnStr(text, fontNormal, AlignEnum.LEFT,false); } + protected void printString(String text, Boolean isBold) { + printer.appendPrnStr(text, fontNormal, AlignEnum.LEFT,isBold); + } + protected void print2ColumnsString(String first, String second) { printer.appendPrnStr(first + " " + second, fontNormal, AlignEnum.LEFT,false); } @@ -657,6 +661,11 @@ public abstract class BaseXPrint { printer.appendPrnStr(first + " " + second + " " + third, fontNormal, AlignEnum.LEFT,false); } + protected void print3ColumnsString(String first, String second, String third, Boolean isBold) { +// printer.appendPrnStr(first + " " + second + " " + third, fontNormal, AlignEnum.LEFT,false); + printer.appendPrnStr(first + " " + second + " " + third, fontNormal, AlignEnum.LEFT,isBold); + } + protected void printTransDetailReport(List lists, HostType hostType) { @@ -675,7 +684,8 @@ public abstract class BaseXPrint { } - breakingLine(); +// breakingLine(); + lineBreak(); long totalAmount = 0; @@ -691,7 +701,7 @@ public abstract class BaseXPrint { } else if (hostType == HostType.QR) { if (pay.getTransactionType() == TransactionsType.MMQR_REFUND.value) { - print2ColumnsString("QR REFUND", ""); + print2ColumnsString("QR PAYMENT", ""); } else { print2ColumnsString(pay.getCustomerMobile(), ""); } @@ -720,17 +730,17 @@ public abstract class BaseXPrint { boolean isDecimalEnabled = SystemParamsOperation.getInstance().getDecimalEnable(); print2ColumnsString("MPU", ""); print2ColumnsString("CARD TYPE", ""); - print3ColumnsString("", "COUNT", "AMT"); + print3ColumnsString("", "COUNT", "AMOUNT"); emptyLine(1); print3ColumnsString("MPU", countStringFormat(lists.size()), "MMK " + PrintUtils.getInstance().getSeparatorNumberFormat(totalAmount, isDecimalEnabled)); } else if (hostType == HostType.QR) { boolean isDecimalEnabled = SystemParamsOperation.getInstance().isQrDecimalEnable(); print2ColumnsString("PAYMENT", ""); - print3ColumnsString("TYPE", "COUNT", "AMT"); - emptyLine(1); - print3ColumnsString("QR PAY", countStringFormat(lists.size()), "MMK " + PrintUtils.getInstance().getSeparatorNumberFormat(totalAmount, isDecimalEnabled)); + print3ColumnsString("TYPE ", "COUNT", "AMOUNT"); +// emptyLine(1); + print3ColumnsString("QR PAY", " "+ countStringFormat(lists.size()), "MMK " + PrintUtils.getInstance().getSeparatorNumberFormat(totalAmount, isDecimalEnabled), true); } - emptyLine(2); +// emptyLine(2); } protected void printQRSettlementTransDetail(List lists) { @@ -769,7 +779,7 @@ public abstract class BaseXPrint { dashBreak(); print2ColumnsString("Sale Total :MMK", PrintUtils.getInstance().getSeparatorOnlyNumberFormat(totalAmount)); dashBreakEnding(); - emptyLine(2); +// emptyLine(2); } @@ -913,9 +923,9 @@ public abstract class BaseXPrint { if(TextUtils.equals(terminalName, "") || terminalName == null){ terminalName = "Terminal Name"; } - emptyLine(1); +// emptyLine(1); // printer.appendPrnStr(receiptHeader, fontNormal, AlignEnum.CENTER,false); - printer.appendPrnStr(terminalName, fontNormal, AlignEnum.CENTER, false); + printer.appendPrnStr(terminalName, fontNormal, AlignEnum.CENTER, true); printer.appendPrnStr(merchantAddress, fontNormal, AlignEnum.CENTER,false); printer.appendPrnStr(merchantAddress2, fontNormal, AlignEnum.CENTER,false); printer.appendPrnStr(merchantAddress3, fontNormal, AlignEnum.CENTER,false); @@ -1047,10 +1057,10 @@ public abstract class BaseXPrint { emptyLine(1); printer.appendPrnStr(transType.replace("_", " "),fontNormal, AlignEnum.CENTER,true); - - if (!(payDetail.getQrTransStatus() != 1 && (payDetail.getTransactionType() == TransactionsType.MMQR_REFUND.value || payDetail.getTransactionType() == TransactionsType.MMQR.value))) { - printer.appendPrnStr("\n", fontNormal, AlignEnum.LEFT,false); - } +// +// if (!(payDetail.getQrTransStatus() != 1 && (payDetail.getTransactionType() == TransactionsType.MMQR_REFUND.value || payDetail.getTransactionType() == TransactionsType.MMQR.value))) { +// printer.appendPrnStr("\n", fontNormal, AlignEnum.LEFT,false); +// } } 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 87b1179..cdb5bb7 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 @@ -356,7 +356,7 @@ public class PrintXImpl extends BaseXPrint implements PrintX { // // } - emptyLine(1); +// emptyLine(1); } else { @@ -450,7 +450,7 @@ public class PrintXImpl extends BaseXPrint implements PrintX { setHeight(0x12); printLogo(); printMerchantHeader(); - printer.appendPrnStr("TERMINAL CONFIGURATION", fontLarge, AlignEnum.CENTER, true); + printer.appendPrnStr("TERMINAL CONFIGURATION", 22, AlignEnum.CENTER, true); printTerminalConfiguration(); startPrintNex(); } catch (RemoteException e) {