Kyaw_Min_Khant/mob_pos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Kyaw_Min_Khant:a6377fb16d913ff1bf4bf131d77c45646820075c
Branches Tags
Kyaw_Min_Khant:main
Kyaw_Min_Khant:latest
Kyaw_Min_Khant:emv_latest
Kyaw_Min_Khant:uat/3.3
Kyaw_Min_Khant:emv
Kyaw_Min_Khant:dev
Kyaw_Min_Khant:uat/3.1
Kyaw_Min_Khant:cz
Kyaw_Min_Khant:test
Kyaw_Min_Khant:mpu
Kyaw_Min_Khant:tms
Kyaw_Min_Khant:new_dash
Kyaw_Min_Khant:Password_screen
..
compare: Kyaw_Min_Khant:74f3d3586b162b13d0e94e986fa175652e5bc165
Branches Tags
Kyaw_Min_Khant:latest
Kyaw_Min_Khant:emv_latest
Kyaw_Min_Khant:uat/3.3
Kyaw_Min_Khant:emv
Kyaw_Min_Khant:dev
Kyaw_Min_Khant:uat/3.1
Kyaw_Min_Khant:cz
Kyaw_Min_Khant:test
Kyaw_Min_Khant:mpu
Kyaw_Min_Khant:tms
Kyaw_Min_Khant:new_dash
Kyaw_Min_Khant:Password_screen
Kyaw_Min_Khant:main

No commits in common. "a6377fb16d913ff1bf4bf131d77c45646820075c" and "74f3d3586b162b13d0e94e986fa175652e5bc165" have entirely different histories.
a6377fb16d ... 74f3d3586b

4 changed files with 12 additions and 13 deletions
Show Stats Expand all files Collapse all files

4
app/build.gradle.kts
View File

@ -43,8 +43,8 @@ android {
dimension = "env" dimension = "env"
applicationIdSuffix = ".uat" applicationIdSuffix = ".uat"
versionNameSuffix = "-UAT" versionNameSuffix = "-UAT"
versionCode = 3 versionCode = 2
versionName = "2.1" versionName = "2.0"
buildConfigField("String", "ENV", "\"UAT\"") buildConfigField("String", "ENV", "\"UAT\"")
resValue("string", "app_name", "MOB-UAT") resValue("string", "app_name", "MOB-UAT")
} }

BIN
paylibs/src/main/assets/libre_basker_ville.ttf
View File

Binary file not shown.

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

@ -52,7 +52,6 @@ public abstract class BaseXPrint {
protected String currentTime; protected String currentTime;
protected static final String typeface_name = "libre_basker_ville.ttf";
protected static final String MPU_AID = "A0000004820000000001"; protected static final String MPU_AID = "A0000004820000000001";
protected static final String HOST_NAME_VM = "VISA/ MASTERCARD"; protected static final String HOST_NAME_VM = "VISA/ MASTERCARD";
@ -401,20 +400,20 @@ public abstract class BaseXPrint {
sunmiPrinterService.sendRAWData(boldOn(), innerResultCallback); sunmiPrinterService.sendRAWData(boldOn(), innerResultCallback);
sunmiPrinterService.setAlignment(0, innerResultCallback); sunmiPrinterService.setAlignment(0, innerResultCallback);
sunmiPrinterService.printTextWithFont(schemeName, typeface_name, 26, innerResultCallback); sunmiPrinterService.printTextWithFont(schemeName, "rubik_medium.ttf", 26, innerResultCallback);
sunmiPrinterService.printText("\n", innerResultCallback); sunmiPrinterService.printText("\n", innerResultCallback);
sunmiPrinterService.printTextWithFont(PrintUtils.getInstance().maskCardNumberPciDss(payDetail.getCardNo()), typeface_name, 26, innerResultCallback); sunmiPrinterService.printTextWithFont(PrintUtils.getInstance().maskCardNumberPciDss(payDetail.getCardNo()), "rubik_medium.ttf", 26, innerResultCallback);
sunmiPrinterService.printText("\n", innerResultCallback); sunmiPrinterService.printText("\n", innerResultCallback);
sunmiPrinterService.printTextWithFont(PrintUtils.getInstance().getFormatExpDateWithSlash(payDetail.getEXPDate()), typeface_name, 26, innerResultCallback); sunmiPrinterService.printTextWithFont(PrintUtils.getInstance().getFormatExpDateWithSlash(payDetail.getEXPDate()), "rubik_medium.ttf", 26, innerResultCallback);
sunmiPrinterService.printText("\n", innerResultCallback); sunmiPrinterService.printText("\n", innerResultCallback);
sunmiPrinterService.printTextWithFont(PrintUtils.getInstance().getEntryType(payDetail.getCardType()) + " ENTRY", typeface_name, 26, innerResultCallback); sunmiPrinterService.printTextWithFont(PrintUtils.getInstance().getEntryType(payDetail.getCardType()) + " ENTRY", "rubik_medium.ttf", 26, innerResultCallback);
sunmiPrinterService.printText("\n", innerResultCallback); sunmiPrinterService.printText("\n", innerResultCallback);
if (payDetail.getTradeAnswerCode().equals(Constant.ANSWER_CODE_APPROVED) || payDetail.getTradeAnswerCode().equals(Constant.ANSWER_CODE_ACCEPT)) { if (payDetail.getTradeAnswerCode().equals(Constant.ANSWER_CODE_APPROVED) || payDetail.getTradeAnswerCode().equals(Constant.ANSWER_CODE_ACCEPT)) {
sunmiPrinterService.printTextWithFont("APPR CODE:" + payDetail.getApprovalCode(), typeface_name, 26, innerResultCallback); sunmiPrinterService.printTextWithFont("APPR CODE:" + payDetail.getApprovalCode(), "rubik_medium.ttf", 26, innerResultCallback);
sunmiPrinterService.printText("\n", innerResultCallback); sunmiPrinterService.printText("\n", innerResultCallback);
sunmiPrinterService.sendRAWData(boldOff(), innerResultCallback); sunmiPrinterService.sendRAWData(boldOff(), innerResultCallback);
sunmiPrinterService.setFontName(typeface_name,innerResultCallback); sunmiPrinterService.setFontName("rubik_medium.ttf",innerResultCallback);
// manual entry or refund // manual entry or refund
if(payDetail.getCardType() == -1 || payDetail.getTransactionType() == TransactionsType.REFUND.value) { if(payDetail.getCardType() == -1 || payDetail.getTransactionType() == TransactionsType.REFUND.value) {
@ -429,7 +428,7 @@ public abstract class BaseXPrint {
} else { } else {
sunmiPrinterService.printText("\n", innerResultCallback); sunmiPrinterService.printText("\n", innerResultCallback);
sunmiPrinterService.sendRAWData(boldOff(), innerResultCallback); sunmiPrinterService.sendRAWData(boldOff(), innerResultCallback);
sunmiPrinterService.setFontName(typeface_name,innerResultCallback); sunmiPrinterService.setFontName("rubik_medium.ttf",innerResultCallback);
sunmiPrinterService.printText("TVR :"+payDetail.getTVR()+"\n",innerResultCallback); sunmiPrinterService.printText("TVR :"+payDetail.getTVR()+"\n",innerResultCallback);
} }
@ -457,7 +456,7 @@ public abstract class BaseXPrint {
sunmiPrinterService.setAlignment(1, innerResultCallback); sunmiPrinterService.setAlignment(1, innerResultCallback);
lineBreak(); lineBreak();
emptyLine(3); emptyLine(3);
sunmiPrinterService.printTextWithFont(BaseErrorCode.getCode(payDetail.getTradeAnswerCode()) + "\n", typeface_name, 26, innerResultCallback); sunmiPrinterService.printTextWithFont(BaseErrorCode.getCode(payDetail.getTradeAnswerCode()) + "\n", "rubik_medium.ttf", 26, innerResultCallback);
emptyLine(3); emptyLine(3);
lineBreak(); lineBreak();
} }
@ -826,7 +825,7 @@ public abstract class BaseXPrint {
try { try {
sunmiPrinterService.sendRAWData(boldOn(), innerResultCallback); sunmiPrinterService.sendRAWData(boldOn(), innerResultCallback);
sunmiPrinterService.setFontName(typeface_name, innerResultCallback); sunmiPrinterService.setFontName("rubik_medium.ttf", innerResultCallback);
sunmiPrinterService.setFontSize(22, innerResultCallback); sunmiPrinterService.setFontSize(22, innerResultCallback);
sunmiPrinterService.printText(receiptHeader + "\n", innerResultCallback); sunmiPrinterService.printText(receiptHeader + "\n", innerResultCallback);
// sunmiPrinterService.printTextWithFont(merchantName + "\n", "", 24, null); // sunmiPrinterService.printTextWithFont(merchantName + "\n", "", 24, null);

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

@ -158,7 +158,7 @@ public class PrintXImpl extends BaseXPrint implements PrintX {
sunmiPrinterService.lineWrap(4, innerResultCallback); sunmiPrinterService.lineWrap(4, innerResultCallback);
sunmiPrinterService.setAlignment(0, innerResultCallback); sunmiPrinterService.setAlignment(0, innerResultCallback);
sunmiPrinterService.setFontName(typeface_name, innerResultCallback); sunmiPrinterService.setFontName("rubik_medium.ttf", innerResultCallback);
sunmiPrinterService.setFontSize(21, innerResultCallback); sunmiPrinterService.setFontSize(21, innerResultCallback);
sunmiPrinterService.printText("[ Send Packets ]" + "\n", innerResultCallback); sunmiPrinterService.printText("[ Send Packets ]" + "\n", innerResultCallback);
printParsedField(msgFieldSend); printParsedField(msgFieldSend);