changed to local server
This commit is contained in:
parent
37b1538e1c
commit
3c77d4d9c7
@ -13,17 +13,6 @@
|
|||||||
</DropdownSelection>
|
</DropdownSelection>
|
||||||
<DialogSelection />
|
<DialogSelection />
|
||||||
</SelectionState>
|
</SelectionState>
|
||||||
<SelectionState runConfigName="testResponseSalePacket()">
|
|
||||||
<option name="selectionMode" value="DROPDOWN" />
|
|
||||||
<DropdownSelection timestamp="2026-01-20T10:15:53.662415Z">
|
|
||||||
<Target type="DEFAULT_BOOT">
|
|
||||||
<handle>
|
|
||||||
<DeviceId pluginId="PhysicalDevice" identifier="serial=0123456789ABCDEF" />
|
|
||||||
</handle>
|
|
||||||
</Target>
|
|
||||||
</DropdownSelection>
|
|
||||||
<DialogSelection />
|
|
||||||
</SelectionState>
|
|
||||||
</selectionStates>
|
</selectionStates>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
@ -1,5 +1,6 @@
|
|||||||
package com.utsmm.kbz;
|
package com.utsmm.kbz;
|
||||||
|
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
import androidx.appcompat.app.ActionBarDrawerToggle;
|
import androidx.appcompat.app.ActionBarDrawerToggle;
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
import androidx.databinding.DataBindingUtil;
|
import androidx.databinding.DataBindingUtil;
|
||||||
@ -157,10 +158,10 @@ public class MainActivity extends AppCompatActivity implements
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void initKey(){
|
private void initKey(){
|
||||||
SystemParamsOperation.getInstance().setTmsAddress("https://api-tms-uat.kbzbank.com:8443/sirius");
|
// SystemParamsOperation.getInstance().setTmsAddress("https://api-tms-uat.kbzbank.com:8443/sirius");
|
||||||
// SystemParamsOperation.getInstance().setTmsAddress("https://sirius-nest.utsmyanmar.com");
|
SystemParamsOperation.getInstance().setTmsAddress("https://sirius-nest.utsmyanmar.com");
|
||||||
SystemParamsOperation.getInstance().setEReceiptAddress("https://api-tms-uat.kbzbank.com:8443/receipt");
|
// SystemParamsOperation.getInstance().setEReceiptAddress("https://api-tms-uat.kbzbank.com:8443/receipt");
|
||||||
// SystemParamsOperation.getInstance().setEReceiptAddress("https://receipt-nest.utsmyanmar.com");
|
SystemParamsOperation.getInstance().setEReceiptAddress("https://receipt-nest.utsmyanmar.com");
|
||||||
|
|
||||||
PinPad pinPad = MyApplication.getInstance().deviceEngine.getPinPad();
|
PinPad pinPad = MyApplication.getInstance().deviceEngine.getPinPad();
|
||||||
byte[] encryptedPIK = SystemParamsOperation.getInstance().getPIK();
|
byte[] encryptedPIK = SystemParamsOperation.getInstance().getPIK();
|
||||||
|
|||||||
@ -287,8 +287,8 @@ public class NetworkModule {
|
|||||||
tmsAddress = getTMSUrlFromNative();
|
tmsAddress = getTMSUrlFromNative();
|
||||||
}
|
}
|
||||||
|
|
||||||
// String baseUrl = tmsAddress.trim() + "/api/v1/"; //for on prim
|
String baseUrl = tmsAddress.trim() + "/api/v1/"; //for on prim
|
||||||
String baseUrl = tmsAddress.trim() + "/"; //for uat and prod
|
// String baseUrl = tmsAddress.trim() + "/"; //for uat and prod
|
||||||
|
|
||||||
final Gson gson =
|
final Gson gson =
|
||||||
new GsonBuilder().create();
|
new GsonBuilder().create();
|
||||||
|
|||||||
@ -42,6 +42,7 @@ import com.utsmyanmar.paylibs.utils.print_utils.BitmapUtils;
|
|||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
@ -444,20 +445,16 @@ public abstract class BaseXPrint {
|
|||||||
printer.appendPrnStr("MID :" + payDetail.getMerchantNo(), fontNormal, AlignEnum.LEFT,false);
|
printer.appendPrnStr("MID :" + payDetail.getMerchantNo(), fontNormal, AlignEnum.LEFT,false);
|
||||||
|
|
||||||
if (payDetail.getTransType().equals("SUMMARY_REPORT")) {
|
if (payDetail.getTransType().equals("SUMMARY_REPORT")) {
|
||||||
printer.appendPrnStr("BATCH NO :" + batchNum, fontNormal, AlignEnum.LEFT,false);
|
printer.appendPrnStr("BTH NO:" + batchNum, fontNormal, AlignEnum.LEFT,false);
|
||||||
} else {
|
} else {
|
||||||
// printer.printColumnsString(new String[]{"BATCH NO :" + batchNum, "INV NO: " + invoiceNo}, new int[]{2, 2}, new int[]{0, 2}, null);
|
// printer.printColumnsString(new String[]{"BATCH NO :" + batchNum, "INV NO: " + invoiceNo}, new int[]{2, 2}, new int[]{0, 2}, null);
|
||||||
printer.appendPrnStr("BATCH 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);
|
||||||
|
|
||||||
@ -1007,6 +1004,32 @@ public abstract class BaseXPrint {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static List<String> wrapAddressText(String text, int maxLen) {
|
||||||
|
List<String> lines = new ArrayList<>();
|
||||||
|
String[] words = text.split("\\s+");
|
||||||
|
|
||||||
|
StringBuilder currentLine = new StringBuilder();
|
||||||
|
|
||||||
|
for (String word : words) {
|
||||||
|
// +1 for space (if line is not empty)
|
||||||
|
if (currentLine.length() + word.length() + 1 <= maxLen) {
|
||||||
|
if (currentLine.length() > 0) {
|
||||||
|
currentLine.append(" ");
|
||||||
|
}
|
||||||
|
currentLine.append(word);
|
||||||
|
} else {
|
||||||
|
lines.add(currentLine.toString());
|
||||||
|
currentLine = new StringBuilder(word);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (currentLine.length() > 0) {
|
||||||
|
lines.add(currentLine.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
return lines;
|
||||||
|
}
|
||||||
|
|
||||||
protected void printMerchantHeader() {
|
protected void printMerchantHeader() {
|
||||||
String receiptHeader = "";
|
String receiptHeader = "";
|
||||||
String merchantName = "";
|
String merchantName = "";
|
||||||
@ -1016,41 +1039,27 @@ public abstract class BaseXPrint {
|
|||||||
String merchantPhoneNo = "";
|
String merchantPhoneNo = "";
|
||||||
String terminalName = "";
|
String terminalName = "";
|
||||||
|
|
||||||
|
|
||||||
merchantName = SystemParamsOperation.getInstance().getMerchantName();
|
merchantName = SystemParamsOperation.getInstance().getMerchantName();
|
||||||
receiptHeader = SystemParamsOperation.getInstance().getReceiptHeader();
|
receiptHeader = SystemParamsOperation.getInstance().getReceiptHeader();
|
||||||
merchantAddress = SystemParamsOperation.getInstance().getMerchantAddress();
|
merchantAddress = SystemParamsOperation.getInstance().getMerchantAddress();
|
||||||
merchantAddress2 = SystemParamsOperation.getInstance().getMerchantAddress2();
|
|
||||||
merchantAddress3 = SystemParamsOperation.getInstance().getMerchantAddress3();
|
|
||||||
merchantPhoneNo = SystemParamsOperation.getInstance().getMerchantPhoneNo();
|
|
||||||
terminalName = SystemParamsOperation.getInstance().getTerminalName();
|
terminalName = SystemParamsOperation.getInstance().getTerminalName();
|
||||||
|
|
||||||
|
List<String> result = wrapAddressText(merchantAddress, 29);
|
||||||
|
|
||||||
if (receiptHeader == null || TextUtils.equals(receiptHeader, "") || receiptHeader.trim().isEmpty()) {
|
if (receiptHeader == null || TextUtils.equals(receiptHeader, "") || receiptHeader.trim().isEmpty()) {
|
||||||
receiptHeader = merchantName;
|
receiptHeader = merchantName;
|
||||||
}
|
}
|
||||||
if (TextUtils.equals(merchantAddress, "") || merchantAddress == null) {
|
if (TextUtils.equals(merchantAddress, "") || merchantAddress == null) {
|
||||||
merchantAddress = "";
|
merchantAddress = "";
|
||||||
}
|
}
|
||||||
if (TextUtils.equals(merchantAddress2, "") || merchantAddress2 == null) {
|
|
||||||
merchantAddress2 = "";
|
|
||||||
}
|
|
||||||
if (TextUtils.equals(merchantAddress3, "") || merchantAddress3 == null) {
|
|
||||||
merchantAddress3 = "";
|
|
||||||
}
|
|
||||||
// if (TextUtils.equals(merchantPhoneNo, "") || merchantPhoneNo == null) {
|
|
||||||
// merchantPhoneNo = "MERCHANT PHONENO";
|
|
||||||
// }
|
|
||||||
if(TextUtils.equals(terminalName, "") || terminalName == null){
|
if(TextUtils.equals(terminalName, "") || terminalName == null){
|
||||||
terminalName = "";
|
terminalName = "";
|
||||||
}
|
}
|
||||||
// emptyLine(1);
|
|
||||||
// printer.appendPrnStr(receiptHeader, fontNormal, AlignEnum.CENTER,false);
|
|
||||||
printer.appendPrnStr(terminalName, fontNormal, AlignEnum.CENTER, true);
|
printer.appendPrnStr(terminalName, fontNormal, AlignEnum.CENTER, true);
|
||||||
printer.appendPrnStr(merchantAddress, fontNormal, AlignEnum.CENTER,false);
|
for (String line : result) {
|
||||||
printer.appendPrnStr(merchantAddress2, fontNormal, AlignEnum.CENTER,false);
|
printer.appendPrnStr(line, fontNormal, AlignEnum.CENTER, false);
|
||||||
printer.appendPrnStr(merchantAddress3, fontNormal, AlignEnum.CENTER,false);
|
}
|
||||||
// printer.appendPrnStr(merchantPhoneNo, fontNormal, AlignEnum.CENTER,false);
|
|
||||||
// emptyLine(1);
|
|
||||||
dotBreak();
|
dotBreak();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -42,10 +42,10 @@ public class SystemParamsSettings implements Serializable {
|
|||||||
|
|
||||||
// private String tmsAddress = "https://tms.smile-mm.com";
|
// private String tmsAddress = "https://tms.smile-mm.com";
|
||||||
// private String tmsAddress = "http://128.199.170.203";
|
// private String tmsAddress = "http://128.199.170.203";
|
||||||
// private String tmsAddress = "https://sirius-nest.utsmyanmar.com";
|
private String tmsAddress = "https://sirius-nest.utsmyanmar.com";
|
||||||
private String tmsAddress = "https://api-tms-uat.kbzbank.com:8443/sirius"; //for uat
|
// private String tmsAddress = "https://api-tms-uat.kbzbank.com:8443/sirius"; //for uat
|
||||||
// private String ereceiptAddress = "https://receipt-nest.utsmyanmar.com"; //for on prime
|
private String ereceiptAddress = "https://receipt-nest.utsmyanmar.com"; //for on prime
|
||||||
private String ereceiptAddress = "https://api-tms-uat.kbzbank.com:8443/receipt"; //for uat
|
// private String ereceiptAddress = "https://api-tms-uat.kbzbank.com:8443/receipt"; //for uat
|
||||||
|
|
||||||
private String binValues = "";
|
private String binValues = "";
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user