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

Compare commits

base: Kyaw_Min_Khant:df025bce3429faffb5857c48520908951d0b18ef
Branches Tags
Kyaw_Min_Khant:main
Kyaw_Min_Khant:ecr_two
Kyaw_Min_Khant:ecr
Kyaw_Min_Khant:duel_settlement
Kyaw_Min_Khant:new_history
Kyaw_Min_Khant:duel_currency
Kyaw_Min_Khant:animation
Kyaw_Min_Khant:merge_latest_SIT
Kyaw_Min_Khant:geo
Kyaw_Min_Khant:auto_print_disable
Kyaw_Min_Khant:refund_fix
Kyaw_Min_Khant:production_1.0
Kyaw_Min_Khant:merge-latest
Kyaw_Min_Khant:latest
Kyaw_Min_Khant:mpu_latest
Kyaw_Min_Khant:merge_with_mpu
Kyaw_Min_Khant:mpu
Kyaw_Min_Khant:merge
Kyaw_Min_Khant:master
..
compare: Kyaw_Min_Khant:a83e98e3c87c3e0c862dec0fbb86605d5770453e
Branches Tags
Kyaw_Min_Khant:ecr_two
Kyaw_Min_Khant:ecr
Kyaw_Min_Khant:duel_settlement
Kyaw_Min_Khant:new_history
Kyaw_Min_Khant:duel_currency
Kyaw_Min_Khant:animation
Kyaw_Min_Khant:merge_latest_SIT
Kyaw_Min_Khant:geo
Kyaw_Min_Khant:auto_print_disable
Kyaw_Min_Khant:refund_fix
Kyaw_Min_Khant:production_1.0
Kyaw_Min_Khant:merge-latest
Kyaw_Min_Khant:latest
Kyaw_Min_Khant:mpu_latest
Kyaw_Min_Khant:merge_with_mpu
Kyaw_Min_Khant:mpu
Kyaw_Min_Khant:merge
Kyaw_Min_Khant:master
Kyaw_Min_Khant:main

No commits in common. "df025bce3429faffb5857c48520908951d0b18ef" and "a83e98e3c87c3e0c862dec0fbb86605d5770453e" have entirely different histories.
df025bce34 ... a83e98e3c8

9 changed files with 192 additions and 891 deletions
Show Stats Expand all files Collapse all files

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

@ -4,25 +4,18 @@ import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.os.Bundle;
import androidx.appcompat.app.AlertDialog;
import android.os.RemoteException;
import android.text.TextUtils;
import android.util.Log;
import android.util.TypedValue;
import android.view.View;
import android.view.Gravity;
import android.widget.Toast;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.Observer;
import androidx.appcompat.widget.AppCompatButton;
import androidx.core.content.ContextCompat;
import com.denzcoskun.imageslider.ImageSlider;
import com.denzcoskun.imageslider.constants.ScaleTypes;
@ -75,7 +68,6 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Objects;
@ -105,13 +97,6 @@ public class MainFragment extends DataBindingFragment {
private final ArrayList<SlideModel> imgList = new ArrayList<>();
private Observer<PayDetail> observeLastTrans;
private PayDetail lastPay;
private boolean cardPrimaryHostCached = false;
private String cardPrimaryHostName = "";
private String cardPrimaryTid = "";
private String cardPrimaryMid = "";
private String cardPrimaryIp = "";
private String cardPrimarySecIp = "";
private CurrencyType cardPrimaryCurrency = CurrencyType.MMK;
@Inject
EmvParamOperation emvParamOperation;
@ -435,200 +420,6 @@ public class MainFragment extends DataBindingFragment {
}
private void startCardSaleFlow() {
processBatch();
sharedViewModel.transactionsType.setValue(TransactionsType.SALE);
sharedViewModel.setTransMenu(TransMenu.SALE);
sharedViewModel.processCode.postValue(ProcessCode.SALE_PURCHASE + ProcessCode.SMART + ProcessCode.TO_ACCOUNT);
navigateToAmount();
}
private void showCurrencyChooserForCardSale() {
List<String> currencies = getAvailableCardSaleCurrencies();
if (currencies.isEmpty()) {
applyCardCurrencyAndHost("MMK");
startCardSaleFlow();
return;
}
if (currencies.size() == 1) {
applyCardCurrencyAndHost(currencies.get(0));
startCardSaleFlow();
return;
}
showCurrencyPickerDialog("Choose Currency", currencies, currency -> {
applyCardCurrencyAndHost(currency);
startCardSaleFlow();
});
}
private List<String> getAvailableCardSaleCurrencies() {
cachePrimaryCardHostIfNeeded();
LinkedHashSet<String> values = new LinkedHashSet<>();
if (cardPrimaryCurrency != null && !TextUtils.isEmpty(cardPrimaryCurrency.name)) {
values.add(normalizeCurrency(cardPrimaryCurrency.name));
}
String secondaryCurrency = normalizeCurrency(SystemParamsOperation.getInstance().getThirdHostCurrency());
if (!TextUtils.isEmpty(SystemParamsOperation.getInstance().getThirdHostName()) && !TextUtils.isEmpty(secondaryCurrency)) {
values.add(secondaryCurrency);
}
return new ArrayList<>(values);
}
private void applyCardCurrencyAndHost(String selectedCurrency) {
cachePrimaryCardHostIfNeeded();
String selected = normalizeCurrency(selectedCurrency);
String secondaryCurrency = normalizeCurrency(SystemParamsOperation.getInstance().getThirdHostCurrency());
boolean useSecondaryCardHost = !TextUtils.isEmpty(SystemParamsOperation.getInstance().getThirdHostName())
&& !TextUtils.isEmpty(secondaryCurrency)
&& secondaryCurrency.equals(selected);
if (useSecondaryCardHost) {
SystemParamsOperation.getInstance().setHostName(SystemParamsOperation.getInstance().getThirdHostName());
SystemParamsOperation.getInstance().setTerminalId(SystemParamsOperation.getInstance().getThirdHostTerminalId());
SystemParamsOperation.getInstance().setMerchantId(SystemParamsOperation.getInstance().getThirdHostMerchantId());
SystemParamsOperation.getInstance().setIpAddress(SystemParamsOperation.getInstance().getThirdHostIpAddress());
SystemParamsOperation.getInstance().setSecIpAddress(SystemParamsOperation.getInstance().getThirdHostSecIpAddress());
} else {
SystemParamsOperation.getInstance().setHostName(cardPrimaryHostName);
SystemParamsOperation.getInstance().setTerminalId(cardPrimaryTid);
SystemParamsOperation.getInstance().setMerchantId(cardPrimaryMid);
SystemParamsOperation.getInstance().setIpAddress(cardPrimaryIp);
SystemParamsOperation.getInstance().setSecIpAddress(cardPrimarySecIp);
}
CurrencyType currencyType = useSecondaryCardHost ? toCurrencyType(selected) : cardPrimaryCurrency;
SystemParamsOperation.getInstance().setCurrencyType(currencyType);
sharedViewModel.set_currencyText(currencyType.name);
}
private void cachePrimaryCardHostIfNeeded() {
if (cardPrimaryHostCached) {
return;
}
cardPrimaryHostName = SystemParamsOperation.getInstance().getHostName();
cardPrimaryTid = SystemParamsOperation.getInstance().getTerminalId();
cardPrimaryMid = SystemParamsOperation.getInstance().getMerchantId();
cardPrimaryIp = SystemParamsOperation.getInstance().getIpAddress();
cardPrimarySecIp = SystemParamsOperation.getInstance().getSecIpAddress();
CurrencyType activeCurrency = SystemParamsOperation.getInstance().getCurrencyType();
cardPrimaryCurrency = activeCurrency == null ? CurrencyType.MMK : activeCurrency;
cardPrimaryHostCached = true;
}
private void showCurrencyPickerDialog(String title, List<String> currencies, CurrencySelectCallback callback) {
LinearLayout root = new LinearLayout(requireContext());
root.setOrientation(LinearLayout.VERTICAL);
root.setPadding(dp(20), dp(20), dp(20), dp(12));
TextView tvTitle = new TextView(requireContext());
tvTitle.setText(title);
tvTitle.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
tvTitle.setTextColor(ContextCompat.getColor(requireContext(), R.color.colorTextTitle));
tvTitle.setPadding(0, 0, 0, dp(16));
root.addView(tvTitle);
final AlertDialog[] dialogHolder = new AlertDialog[1];
for (String currency : currencies) {
AppCompatButton button = new AppCompatButton(requireContext());
LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
LinearLayout.LayoutParams.MATCH_PARENT,
dp(56)
);
lp.bottomMargin = dp(10);
button.setLayoutParams(lp);
button.setAllCaps(false);
button.setText(currency);
button.setTextSize(TypedValue.COMPLEX_UNIT_SP, 18);
button.setGravity(Gravity.CENTER);
button.setBackgroundResource(R.drawable.bg_rounded_btn_cv);
button.setTextColor(ContextCompat.getColor(requireContext(), R.color.white));
button.setOnClickListener(v -> {
if (dialogHolder[0] != null) {
dialogHolder[0].dismiss();
}
callback.onSelected(currency);
});
root.addView(button);
}
AppCompatButton cancel = new AppCompatButton(requireContext());
LinearLayout.LayoutParams cancelLp = new LinearLayout.LayoutParams(
LinearLayout.LayoutParams.MATCH_PARENT,
dp(52)
);
cancel.setLayoutParams(cancelLp);
cancel.setAllCaps(false);
cancel.setText("Cancel");
cancel.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16);
cancel.setBackgroundResource(R.drawable.bg_rounded_btn_cancel_cv);
cancel.setTextColor(ContextCompat.getColor(requireContext(), R.color.colorPrimary));
cancel.setOnClickListener(v -> {
if (dialogHolder[0] != null) {
dialogHolder[0].dismiss();
}
});
root.addView(cancel);
AlertDialog dialog = new AlertDialog.Builder(requireContext())
.setView(root)
.create();
dialogHolder[0] = dialog;
dialog.show();
}
private int dp(int value) {
return Math.round(value * requireContext().getResources().getDisplayMetrics().density);
}
private interface CurrencySelectCallback {
void onSelected(String currency);
}
private CurrencyType toCurrencyType(String value) {
String normalized = normalizeCurrency(value);
try {
return CurrencyType.valueOf(normalized);
} catch (Exception ignored) {
return CurrencyType.MMK;
}
}
private String normalizeCurrency(String raw) {
if (TextUtils.isEmpty(raw)) {
return "";
}
String value = raw.trim().toUpperCase();
switch (value) {
case "104":
case "MMK":
return "MMK";
case "840":
case "USD":
return "USD";
case "156":
case "CNY":
case "RMB":
return "CNY";
case "764":
case "THB":
return "THB";
case "643":
case "RUB":
return "RUB";
default:
return value;
}
}
private void processBatch() {
calculateLastTransaction();
@ -931,11 +722,18 @@ public class MainFragment extends DataBindingFragment {
showSingleInfoDialog(getResourceString(R.string.txt_please_enable_internet));
} else if (SystemParamsOperation.getInstance().isNeedSettlement()) {
AlertXDialog.getInstance().showDialog(requireContext(), getResourceString(R.string.title_need_settle), getResourceString(R.string.txt_do_you_want_to_continue), () -> {
showCurrencyChooserForCardSale();
processBatch();
sharedViewModel.transactionsType.setValue(TransactionsType.SALE);
sharedViewModel.processCode.postValue(ProcessCode.SALE_PURCHASE + ProcessCode.SMART + ProcessCode.TO_ACCOUNT);
navigateToAmount();
});
} else {
showCurrencyChooserForCardSale();
processBatch();
sharedViewModel.transactionsType.setValue(TransactionsType.SALE);
sharedViewModel.setTransMenu(TransMenu.SALE);
sharedViewModel.processCode.postValue(ProcessCode.SALE_PURCHASE + ProcessCode.SMART + ProcessCode.TO_ACCOUNT);
navigateToAmount();
}
}

222
app/src/main/java/com/utsmm/kbz/ui/dashboard/DashboardTransFragment.java
View File

@ -2,25 +2,16 @@ package com.utsmm.kbz.ui.dashboard;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.TypedValue;
import android.view.View;
import android.view.Gravity;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.AppCompatButton;
import androidx.core.content.ContextCompat;
import com.utsmm.kbz.util.enums.SettlementType;
import com.utsmyanmar.baselib.fragment.DataBindingFragment;
import com.utsmyanmar.baselib.util.DataBindingConfig;
import com.utsmyanmar.paylibs.utils.LogUtil;
import com.utsmyanmar.paylibs.utils.core_utils.SystemParamsOperation;
import com.utsmyanmar.paylibs.utils.enums.CurrencyType;
import com.utsmyanmar.paylibs.utils.enums.TransMenu;
import com.utsmyanmar.paylibs.utils.iso_utils.TransactionsType;
import com.utsmm.kbz.BR;
@ -33,8 +24,6 @@ import com.utsmm.kbz.ui.core_viewmodel.SharedViewModel;
import com.utsmm.kbz.util.tms.TMSUtil;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
public class DashboardTransFragment extends DataBindingFragment {
@ -45,13 +34,6 @@ public class DashboardTransFragment extends DataBindingFragment {
private ArrayList<Features> featuresList = new ArrayList<>();
MainAdapter mainAdapter;
private boolean cardPrimaryHostCached = false;
private String cardPrimaryHostName = "";
private String cardPrimaryTid = "";
private String cardPrimaryMid = "";
private String cardPrimaryIp = "";
private String cardPrimarySecIp = "";
private CurrencyType cardPrimaryCurrency = CurrencyType.MMK;
private static final int hostId = Constants.NAV_HOST_ID;
private int routeId;
@ -238,11 +220,9 @@ public class DashboardTransFragment extends DataBindingFragment {
} else if (checkTid()) {
showDeclineDialog("Please Download Config!");
} else {
showCurrencyChooserForCardFlow(() -> {
sharedViewModel.setTransactionsType(TransactionsType.PRE_AUTH_SALE);
routeId = R.id.action_dashboardTransFragment_to_inputAmountFragment;
safeRouteTo(currentId, routeId, hostId);
});
sharedViewModel.setTransactionsType(TransactionsType.PRE_AUTH_SALE);
routeId = R.id.action_dashboardTransFragment_to_inputAmountFragment;
safeRouteTo(currentId,routeId,hostId);
}
}
@ -273,12 +253,10 @@ public class DashboardTransFragment extends DataBindingFragment {
public void onClickCashAdvance() {
showCurrencyChooserForCardFlow(() -> {
sharedViewModel.setTransactionsType(TransactionsType.CASH_OUT);
sharedViewModel.setTransMenu(TransMenu.CASH_OUT);
routeId = R.id.action_dashboardTransFragment_to_inputAmountFragment;
safeRouteTo(currentId, routeId, hostId);
});
sharedViewModel.setTransactionsType(TransactionsType.CASH_OUT);
sharedViewModel.setTransMenu(TransMenu.CASH_OUT);
routeId = R.id.action_dashboardTransFragment_to_inputAmountFragment;
safeRouteTo(currentId,routeId,hostId);
}
public void onClickDeviceConfig(){
@ -287,190 +265,4 @@ public class DashboardTransFragment extends DataBindingFragment {
}
}
private void showCurrencyChooserForCardFlow(Runnable onSelected) {
List<String> currencies = getAvailableCardSaleCurrencies();
if (currencies.isEmpty()) {
applyCardCurrencyAndHost("MMK");
onSelected.run();
return;
}
if (currencies.size() == 1) {
applyCardCurrencyAndHost(currencies.get(0));
onSelected.run();
return;
}
showCurrencyPickerDialog("Choose Currency", currencies, currency -> {
applyCardCurrencyAndHost(currency);
onSelected.run();
});
}
private List<String> getAvailableCardSaleCurrencies() {
cachePrimaryCardHostIfNeeded();
LinkedHashSet<String> values = new LinkedHashSet<>();
if (cardPrimaryCurrency != null && !TextUtils.isEmpty(cardPrimaryCurrency.name)) {
values.add(normalizeCurrency(cardPrimaryCurrency.name));
}
String secondaryCurrency = normalizeCurrency(SystemParamsOperation.getInstance().getThirdHostCurrency());
if (!TextUtils.isEmpty(SystemParamsOperation.getInstance().getThirdHostName()) && !TextUtils.isEmpty(secondaryCurrency)) {
values.add(secondaryCurrency);
}
return new ArrayList<>(values);
}
private void applyCardCurrencyAndHost(String selectedCurrency) {
cachePrimaryCardHostIfNeeded();
String selected = normalizeCurrency(selectedCurrency);
String secondaryCurrency = normalizeCurrency(SystemParamsOperation.getInstance().getThirdHostCurrency());
boolean useSecondaryCardHost = !TextUtils.isEmpty(SystemParamsOperation.getInstance().getThirdHostName())
&& !TextUtils.isEmpty(secondaryCurrency)
&& secondaryCurrency.equals(selected);
if (useSecondaryCardHost) {
SystemParamsOperation.getInstance().setHostName(SystemParamsOperation.getInstance().getThirdHostName());
SystemParamsOperation.getInstance().setTerminalId(SystemParamsOperation.getInstance().getThirdHostTerminalId());
SystemParamsOperation.getInstance().setMerchantId(SystemParamsOperation.getInstance().getThirdHostMerchantId());
SystemParamsOperation.getInstance().setIpAddress(SystemParamsOperation.getInstance().getThirdHostIpAddress());
SystemParamsOperation.getInstance().setSecIpAddress(SystemParamsOperation.getInstance().getThirdHostSecIpAddress());
} else {
SystemParamsOperation.getInstance().setHostName(cardPrimaryHostName);
SystemParamsOperation.getInstance().setTerminalId(cardPrimaryTid);
SystemParamsOperation.getInstance().setMerchantId(cardPrimaryMid);
SystemParamsOperation.getInstance().setIpAddress(cardPrimaryIp);
SystemParamsOperation.getInstance().setSecIpAddress(cardPrimarySecIp);
}
CurrencyType currencyType = useSecondaryCardHost ? toCurrencyType(selected) : cardPrimaryCurrency;
SystemParamsOperation.getInstance().setCurrencyType(currencyType);
sharedViewModel.set_currencyText(currencyType.name);
}
private void cachePrimaryCardHostIfNeeded() {
if (cardPrimaryHostCached) {
return;
}
cardPrimaryHostName = SystemParamsOperation.getInstance().getHostName();
cardPrimaryTid = SystemParamsOperation.getInstance().getTerminalId();
cardPrimaryMid = SystemParamsOperation.getInstance().getMerchantId();
cardPrimaryIp = SystemParamsOperation.getInstance().getIpAddress();
cardPrimarySecIp = SystemParamsOperation.getInstance().getSecIpAddress();
CurrencyType activeCurrency = SystemParamsOperation.getInstance().getCurrencyType();
cardPrimaryCurrency = activeCurrency == null ? CurrencyType.MMK : activeCurrency;
cardPrimaryHostCached = true;
}
private CurrencyType toCurrencyType(String value) {
String normalized = normalizeCurrency(value);
try {
return CurrencyType.valueOf(normalized);
} catch (Exception ignored) {
return CurrencyType.MMK;
}
}
private String normalizeCurrency(String raw) {
if (TextUtils.isEmpty(raw)) {
return "";
}
String value = raw.trim().toUpperCase();
switch (value) {
case "104":
case "MMK":
return "MMK";
case "840":
case "USD":
return "USD";
case "156":
case "CNY":
case "RMB":
return "CNY";
case "764":
case "THB":
return "THB";
case "643":
case "RUB":
return "RUB";
default:
return value;
}
}
private void showCurrencyPickerDialog(String title, List<String> currencies, CurrencySelectCallback callback) {
LinearLayout root = new LinearLayout(requireContext());
root.setOrientation(LinearLayout.VERTICAL);
root.setPadding(dp(20), dp(20), dp(20), dp(12));
TextView tvTitle = new TextView(requireContext());
tvTitle.setText(title);
tvTitle.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
tvTitle.setTextColor(ContextCompat.getColor(requireContext(), R.color.colorTextTitle));
tvTitle.setPadding(0, 0, 0, dp(16));
root.addView(tvTitle);
final AlertDialog[] dialogHolder = new AlertDialog[1];
for (String currency : currencies) {
AppCompatButton button = new AppCompatButton(requireContext());
LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
LinearLayout.LayoutParams.MATCH_PARENT,
dp(56)
);
lp.bottomMargin = dp(10);
button.setLayoutParams(lp);
button.setAllCaps(false);
button.setText(currency);
button.setTextSize(TypedValue.COMPLEX_UNIT_SP, 18);
button.setGravity(Gravity.CENTER);
button.setBackgroundResource(R.drawable.bg_rounded_btn_cv);
button.setTextColor(ContextCompat.getColor(requireContext(), R.color.white));
button.setOnClickListener(v -> {
if (dialogHolder[0] != null) {
dialogHolder[0].dismiss();
}
callback.onSelected(currency);
});
root.addView(button);
}
AppCompatButton cancel = new AppCompatButton(requireContext());
LinearLayout.LayoutParams cancelLp = new LinearLayout.LayoutParams(
LinearLayout.LayoutParams.MATCH_PARENT,
dp(52)
);
cancel.setLayoutParams(cancelLp);
cancel.setAllCaps(false);
cancel.setText("Cancel");
cancel.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16);
cancel.setBackgroundResource(R.drawable.bg_rounded_btn_cancel_cv);
cancel.setTextColor(ContextCompat.getColor(requireContext(), R.color.colorPrimary));
cancel.setOnClickListener(v -> {
if (dialogHolder[0] != null) {
dialogHolder[0].dismiss();
}
});
root.addView(cancel);
AlertDialog dialog = new AlertDialog.Builder(requireContext())
.setView(root)
.create();
dialogHolder[0] = dialog;
dialog.show();
}
private int dp(int value) {
return Math.round(value * requireContext().getResources().getDisplayMetrics().density);
}
private interface CurrencySelectCallback {
void onSelected(String currency);
}
}

68
app/src/main/java/com/utsmm/kbz/ui/settings/HostConfigViewModel.java
View File

@ -40,16 +40,6 @@ public class HostConfigViewModel extends ViewModel {
public MutableLiveData<String> secHostPrimaryPort = new MutableLiveData<>();
public MutableLiveData<String> secHostSecondaryIp = new MutableLiveData<>();
public MutableLiveData<String> secHostSecondaryPort = new MutableLiveData<>();
public MutableLiveData<String> secHostCurrency = new MutableLiveData<>();
// Third Host
public MutableLiveData<String> thirdHostName = new MutableLiveData<>();
public MutableLiveData<String> thirdHostShortCode = new MutableLiveData<>();
public MutableLiveData<String> thirdHostPrimaryIp = new MutableLiveData<>();
public MutableLiveData<String> thirdHostPrimaryPort = new MutableLiveData<>();
public MutableLiveData<String> thirdHostSecondaryIp = new MutableLiveData<>();
public MutableLiveData<String> thirdHostSecondaryPort = new MutableLiveData<>();
public MutableLiveData<String> thirdHostCurrency = new MutableLiveData<>();
public MutableLiveData<String> terminalName = new MutableLiveData<>();
@ -59,7 +49,7 @@ public class HostConfigViewModel extends ViewModel {
merchantName.setValue(sp.getMerchantName());
merchantPhone.setValue(sp.getMerchantPhoneNo());
merchantAddress1.setValue(wrapMerchantAddress(sp.getMerchantAddress()));
terminalName.setValue(wrapTerminalName(sp.getTerminalName()));
terminalName.setValue(sp.getTerminalName());
// PRIMARY HOST
hostName.setValue(sp.getHostName());
@ -74,7 +64,7 @@ public class HostConfigViewModel extends ViewModel {
secondaryIp.setValue(sec[0]);
secondaryPort.setValue(sec[1]);
currencyCode.setValue(normalizeCurrency(sp.getCurrencyType() != null ? sp.getCurrencyType().toString() : ""));
currencyCode.setValue(sp.getCurrencyType() != null ? sp.getCurrencyType().toString() : "");
if (sp.getSecHostName() != null && !sp.getSecHostName().isEmpty()) {
@ -91,46 +81,6 @@ public class HostConfigViewModel extends ViewModel {
String[] shs = split(sp.getSecHostSecIpAddress());
secHostSecondaryIp.setValue(shs[0]);
secHostSecondaryPort.setValue(shs[1]);
secHostCurrency.setValue(normalizeCurrency(sp.getSecHostCurrency()));
}
if (sp.getThirdHostName() != null && !sp.getThirdHostName().isEmpty()) {
thirdHostName.setValue(sp.getThirdHostName());
thirdHostShortCode.setValue(sp.getThirdHostShortCode());
String[] thp = split(sp.getThirdHostIpAddress());
thirdHostPrimaryIp.setValue(thp[0]);
thirdHostPrimaryPort.setValue(thp[1]);
String[] ths = split(sp.getThirdHostSecIpAddress());
thirdHostSecondaryIp.setValue(ths[0]);
thirdHostSecondaryPort.setValue(ths[1]);
thirdHostCurrency.setValue(normalizeCurrency(sp.getThirdHostCurrency()));
}
}
private String normalizeCurrency(String raw) {
if (TextUtils.isEmpty(raw)) return "";
String value = raw.trim().toUpperCase();
switch (value) {
case "104":
case "MMK":
return "MMK";
case "840":
case "USD":
return "USD";
case "156":
case "CNY":
case "RMB":
return "CNY";
case "764":
case "THB":
return "THB";
case "643":
case "RUB":
return "RUB";
default:
return value;
}
}
@ -150,20 +100,6 @@ public class HostConfigViewModel extends ViewModel {
return TextUtils.join("\n", lines);
}
private String wrapTerminalName(String name) {
if (TextUtils.isEmpty(name)) return "";
String formattedName = name
.replace("\\r\\n", "\n")
.replace("\\n", "\n")
.replace("\r\n", "\n")
.trim();
List<String> lines = wrapAddressText(formattedName, 29);
return TextUtils.join("\n", lines);
}
private String[] split(String raw) {
if (raw == null || raw.trim().isEmpty()) {
return new String[]{"", ""};

198
app/src/main/java/com/utsmm/kbz/util/tms/TMSSetupsImpl.java
View File

@ -103,14 +103,6 @@ public class TMSSetupsImpl implements TMSSetups{
SystemParamsOperation.getInstance().setIpAddress("");
SystemParamsOperation.getInstance().setSecIpAddress("");
SystemParamsOperation.getInstance().setThirdHostName("");
SystemParamsOperation.getInstance().setThirdHostTerminalId("");
SystemParamsOperation.getInstance().setThirdHostMerchantId("");
SystemParamsOperation.getInstance().setThirdHostIpAddress("");
SystemParamsOperation.getInstance().setThirdHostSecIpAddress("");
SystemParamsOperation.getInstance().setThirdHostShortCode("");
SystemParamsOperation.getInstance().setThirdHostCurrency("");
SystemParamsOperation.getInstance().setSecHostName("");
SystemParamsOperation.getInstance().setSecHostTerminalId("");
SystemParamsOperation.getInstance().setSecHostMerchantId("");
@ -195,96 +187,120 @@ public class TMSSetupsImpl implements TMSSetups{
}
if(!siriusHosts.isEmpty()) {
SiriusHost qrHost = null;
ArrayList<SiriusHost> cardHosts = new ArrayList<>();
for (SiriusHost siriusHost: siriusHosts) {
if ("QR".equalsIgnoreCase(siriusHost.getTyp())) {
if (qrHost == null) qrHost = siriusHost;
if( siriusHost.getTyp().equals("QR")) {
SystemParamsOperation.getInstance().setSecHostId(siriusHost.getId());
SystemParamsOperation.getInstance().setSecHostName(siriusHost.getName());
SystemParamsOperation.getInstance().setSecHostTerminalId(siriusHost.getTid());
SystemParamsOperation.getInstance().setSecHostMerchantId(extractDigits(siriusHost.getMid()));
SystemParamsOperation.getInstance().setShortCode(siriusHost.getShortCode());
if (siriusHost.getPrimaryIP().contains(":")) {
SystemParamsOperation.getInstance().setSecHostIpAddress(siriusHost.getPrimaryIP().trim()+"/");
} else if(siriusHost.getPrimaryIP().trim().isEmpty()) {
SystemParamsOperation.getInstance().setSecHostIpAddress("");
}
if (siriusHost.getSecondaryIP().contains(":")) {
SystemParamsOperation.getInstance().setSecHostSecIpAddress(siriusHost.getSecondaryIP().trim()+"/");
} else if(siriusHost.getSecondaryIP().trim().isEmpty()) {
SystemParamsOperation.getInstance().setSecHostSecIpAddress("");
}
if (!siriusHost.getCurrency().isEmpty()) {
SystemParamsOperation.getInstance().setSecHostCurrency(currencyTextToCode(siriusHost.getCurrency()));
// if(tmsUpdate == TMSUpdate.CHECK){
// if(SystemParamsOperation.getInstance().getSecHostCurrency() != null) {
// if(!currencyCodeToText(SystemParamsOperation.getInstance().getSecHostCurrency()).equals(siriusHost.getCurrency())) {
// SystemParamsOperation.getInstance().setNeedSettlement(true);
// } else {
//// SystemParamsOperation.getInstance().setCurrencyType(currencyTextToCurrencyType(siriusHost.getCurrency()));
// SystemParamsOperation.getInstance().setSecHostCurrency(currencyTextToCode(siriusHost.getCurrency()));
// }
// }
//
// } else if(tmsUpdate == TMSUpdate.UPDATE){
//
// SystemParamsOperation.getInstance().setSecHostCurrency(currencyTextToCode(siriusHost.getCurrency()));
// }
}
if (siriusHost.getShortCode() == null || siriusHost.getShortCode().isEmpty()) {
SystemParamsOperation.getInstance().setShortCode("");
}
} else {
cardHosts.add(siriusHost);
SystemParamsOperation.getInstance().setHostName(siriusHost.getName());
SystemParamsOperation.getInstance().setTerminalId(siriusHost.getTid());
SystemParamsOperation.getInstance().setMerchantId(siriusHost.getMid());
if (siriusHost.getPrimaryIP().contains(":")) {
SystemParamsOperation.getInstance().setIpAddress(siriusHost.getPrimaryIP().trim());
} else if(siriusHost.getPrimaryIP().trim().isEmpty()) {
SystemParamsOperation.getInstance().setIpAddress("");
}
String secondaryIp = siriusHost.getSecondaryIP();
if(secondaryIp == null || secondaryIp.trim().isEmpty()){
SystemParamsOperation.getInstance().setSecIpAddress("");
}else if(secondaryIp.contains(":")){
SystemParamsOperation.getInstance().setSecIpAddress(secondaryIp.trim());
}
// if (siriusHost.getSecondaryIP().contains(":")) {
//
// SystemParamsOperation.getInstance().setSecIpAddress(siriusHost.getSecondaryIP().trim());
//
// } else if(siriusHost.getSecondaryIP().trim().isEmpty()){
// SystemParamsOperation.getInstance().setSecIpAddress("");
// }
if (!siriusHost.getCurrency().isEmpty()) {
SystemParamsOperation.getInstance().setCurrencyType(currencyTextToCurrencyType(siriusHost.getCurrency()));
// if(tmsUpdate == TMSUpdate.CHECK){
// if(SystemParamsOperation.getInstance().getCurrencyCode() != null) {
// if(!currencyCodeToText(SystemParamsOperation.getInstance().getCurrencyCode()).equals(siriusHost.getCurrency())) {
// SystemParamsOperation.getInstance().setNeedSettlement(true);
// } else {
//
// SystemParamsOperation.getInstance().setCurrencyType(currencyTextToCurrencyType(siriusHost.getCurrency()));
//// SystemParamsOperation.getInstance().setCurrencyCode(currencyTextToCode(siriusHost.getCurrency()));
// }
// }
//
// } else if(tmsUpdate == TMSUpdate.UPDATE){
// SystemParamsOperation.getInstance().setCurrencyType(currencyTextToCurrencyType(siriusHost.getCurrency()));
//// SystemParamsOperation.getInstance().setCurrencyCode(currencyTextToCode(siriusHost.getCurrency()));
// }
}
if (siriusHost.getTid().isEmpty() || siriusHost.getMid().isEmpty() ) {
if(siriusHost.getTid().isEmpty()) {
SystemParamsOperation.getInstance().setTerminalId("");
}
if(siriusHost.getMid().isEmpty()) {
SystemParamsOperation.getInstance().setMerchantId("");
}
}
}
}
// For dual-currency card flow, prefer MMK as PRIMARY HOST.
if (cardHosts.size() >= 2) {
SiriusHost first = cardHosts.get(0);
SiriusHost second = cardHosts.get(1);
boolean firstIsMMK = "MMK".equalsIgnoreCase(first.getCurrency());
boolean secondIsMMK = "MMK".equalsIgnoreCase(second.getCurrency());
if (!firstIsMMK && secondIsMMK) {
cardHosts.set(0, second);
cardHosts.set(1, first);
}
}
// PRIMARY HOST (Card #1)
if (!cardHosts.isEmpty()) {
SiriusHost primaryCard = cardHosts.get(0);
SystemParamsOperation.getInstance().setHostName(primaryCard.getName() == null ? "" : primaryCard.getName());
SystemParamsOperation.getInstance().setTerminalId(primaryCard.getTid() == null ? "" : primaryCard.getTid());
SystemParamsOperation.getInstance().setMerchantId(primaryCard.getMid() == null ? "" : primaryCard.getMid());
String primaryIp = primaryCard.getPrimaryIP();
SystemParamsOperation.getInstance().setIpAddress(primaryIp != null && primaryIp.contains(":") ? primaryIp.trim() : "");
String secondaryIp = primaryCard.getSecondaryIP();
SystemParamsOperation.getInstance().setSecIpAddress(secondaryIp != null && secondaryIp.contains(":") ? secondaryIp.trim() : "");
if (!TextUtils.isEmpty(primaryCard.getCurrency())) {
SystemParamsOperation.getInstance().setCurrencyType(currencyTextToCurrencyType(primaryCard.getCurrency()));
}
}
// SECONDARY HOST (Card #2)
if (cardHosts.size() > 1) {
SiriusHost secondaryCard = cardHosts.get(1);
SystemParamsOperation.getInstance().setThirdHostName(secondaryCard.getName() == null ? "" : secondaryCard.getName());
SystemParamsOperation.getInstance().setThirdHostTerminalId(secondaryCard.getTid() == null ? "" : secondaryCard.getTid());
SystemParamsOperation.getInstance().setThirdHostMerchantId(secondaryCard.getMid() == null ? "" : secondaryCard.getMid());
SystemParamsOperation.getInstance().setThirdHostShortCode(secondaryCard.getShortCode() == null ? "" : secondaryCard.getShortCode());
String thirdPrimaryIp = secondaryCard.getPrimaryIP();
SystemParamsOperation.getInstance().setThirdHostIpAddress(thirdPrimaryIp != null && thirdPrimaryIp.contains(":") ? thirdPrimaryIp.trim() : "");
String thirdSecondaryIp = secondaryCard.getSecondaryIP();
SystemParamsOperation.getInstance().setThirdHostSecIpAddress(thirdSecondaryIp != null && thirdSecondaryIp.contains(":") ? thirdSecondaryIp.trim() : "");
if (!TextUtils.isEmpty(secondaryCard.getCurrency())) {
SystemParamsOperation.getInstance().setThirdHostCurrency(currencyTextToCode(secondaryCard.getCurrency()));
}
}
// QR HOST
if (qrHost != null) {
SystemParamsOperation.getInstance().setSecHostId(qrHost.getId());
SystemParamsOperation.getInstance().setSecHostName(qrHost.getName());
SystemParamsOperation.getInstance().setSecHostTerminalId(qrHost.getTid() == null ? "" : qrHost.getTid());
SystemParamsOperation.getInstance().setSecHostMerchantId(qrHost.getMid() == null ? "" : extractDigits(qrHost.getMid()));
SystemParamsOperation.getInstance().setShortCode(qrHost.getShortCode());
String qrPrimaryIp = qrHost.getPrimaryIP();
if (qrPrimaryIp != null && qrPrimaryIp.contains(":")) {
SystemParamsOperation.getInstance().setSecHostIpAddress(qrPrimaryIp.trim()+"/");
} else {
SystemParamsOperation.getInstance().setSecHostIpAddress("");
}
String qrSecondaryIp = qrHost.getSecondaryIP();
if (qrSecondaryIp != null && qrSecondaryIp.contains(":")) {
SystemParamsOperation.getInstance().setSecHostSecIpAddress(qrSecondaryIp.trim()+"/");
} else {
SystemParamsOperation.getInstance().setSecHostSecIpAddress("");
}
if (!TextUtils.isEmpty(qrHost.getCurrency())) {
SystemParamsOperation.getInstance().setSecHostCurrency(currencyTextToCode(qrHost.getCurrency()));
}
if (qrHost.getShortCode() == null || qrHost.getShortCode().isEmpty()) {
SystemParamsOperation.getInstance().setShortCode("");
}
}
}

200
app/src/main/res/layout/fragment_host_config.xml
View File

@ -96,73 +96,65 @@
android:layout_width="match_parent"/>
<!-- ===== PRIMARY HOST ===== -->
<LinearLayout
<TextView
android:text="PRIMARY HOST"
android:paddingBottom="4dp"
style="@style/HostLabelStyle"
android:layout_height="wrap_content"
android:layout_width="match_parent"/>
<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility='@{!TextUtils.isEmpty(viewModel.hostName) ? View.VISIBLE : View.GONE}'
tools:visibility="visible">
android:stretchColumns="1">
<TextView
android:text="PRIMARY HOST"
android:paddingBottom="4dp"
style="@style/HostLabelStyle"
android:layout_height="wrap_content"
android:layout_width="match_parent"/>
<TableRow>
<TextView style="@style/HostLabelStyle" android:text="Name"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.hostName}'/>
</TableRow>
<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:stretchColumns="1">
<TableRow>
<TextView style="@style/HostLabelStyle" android:text="TID"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.tid}'/>
</TableRow>
<TableRow>
<TextView style="@style/HostLabelStyle" android:text="Name"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.hostName}'/>
</TableRow>
<TableRow>
<TextView style="@style/HostLabelStyle" android:text="MID"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.mid}'/>
</TableRow>
<TableRow android:visibility='@{!TextUtils.isEmpty(viewModel.tid) ? View.VISIBLE : View.GONE}'>
<TextView style="@style/HostLabelStyle" android:text="TID"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.tid}'/>
</TableRow>
<TableRow>
<TextView style="@style/HostLabelStyle" android:text="Primary IP"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.primaryIp}'/>
</TableRow>
<TableRow>
<TextView style="@style/HostLabelStyle" android:text="Primary Port"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.primaryPort}'/>
</TableRow>
<TableRow android:visibility='@{!TextUtils.isEmpty(viewModel.mid) ? View.VISIBLE : View.GONE}'>
<TextView style="@style/HostLabelStyle" android:text="MID"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.mid}'/>
</TableRow>
<TableRow>
<TextView style="@style/HostLabelStyle" android:text="Secondary IP"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.secondaryIp}'/>
</TableRow>
<TableRow android:visibility='@{!TextUtils.isEmpty(viewModel.primaryIp) ? View.VISIBLE : View.GONE}'>
<TextView style="@style/HostLabelStyle" android:text="Primary IP"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.primaryIp}'/>
</TableRow>
<TableRow android:visibility='@{!TextUtils.isEmpty(viewModel.primaryPort) ? View.VISIBLE : View.GONE}'>
<TextView style="@style/HostLabelStyle" android:text="Primary Port"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.primaryPort}'/>
</TableRow>
<TableRow>
<TextView style="@style/HostLabelStyle" android:text="Secondary Port"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.secondaryPort}'/>
</TableRow>
<TableRow android:visibility='@{!TextUtils.isEmpty(viewModel.secondaryIp) ? View.VISIBLE : View.GONE}'>
<TextView style="@style/HostLabelStyle" android:text="Secondary IP"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.secondaryIp}'/>
</TableRow>
<TableRow android:visibility='@{!TextUtils.isEmpty(viewModel.secondaryPort) ? View.VISIBLE : View.GONE}'>
<TextView style="@style/HostLabelStyle" android:text="Secondary Port"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.secondaryPort}'/>
</TableRow>
<TableRow android:visibility='@{!TextUtils.isEmpty(viewModel.currencyCode) ? View.VISIBLE : View.GONE}'>
<TextView style="@style/HostLabelStyle" android:text="Currency"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.currencyCode}'/>
</TableRow>
</TableLayout>
</LinearLayout>
<TableRow>
<TextView style="@style/HostLabelStyle" android:text="Currency"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.currencyCode}'/>
</TableRow>
</TableLayout>
<TextView
android:text="--------------------------------------------------------------------------"
@ -176,8 +168,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility='@{!TextUtils.isEmpty(viewModel.thirdHostName) ? View.VISIBLE : View.GONE}'
tools:visibility="gone">
android:visibility='@{!TextUtils.isEmpty(viewModel.secHostName) ? View.VISIBLE : View.GONE}'
tools:visibility="visible">
<TextView
android:text="SECONDARY HOST"
@ -189,80 +181,6 @@
android:layout_height="wrap_content"
android:layout_width="match_parent"/>
<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:stretchColumns="1">
<TableRow>
<TextView style="@style/HostLabelStyle" android:text="Name"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.thirdHostName}'/>
</TableRow>
<TableRow android:visibility='@{!TextUtils.isEmpty(viewModel.thirdHostShortCode) ? View.VISIBLE : View.GONE}'>
<TextView style="@style/HostLabelStyle" android:text="Short Code"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.thirdHostShortCode}'/>
</TableRow>
<TableRow android:visibility='@{!TextUtils.isEmpty(viewModel.thirdHostPrimaryIp) ? View.VISIBLE : View.GONE}'>
<TextView style="@style/HostLabelStyle" android:text="Primary IP"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.thirdHostPrimaryIp}'/>
</TableRow>
<TableRow android:visibility='@{!TextUtils.isEmpty(viewModel.thirdHostPrimaryPort) ? View.VISIBLE : View.GONE}'>
<TextView style="@style/HostLabelStyle" android:text="Primary Port"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.thirdHostPrimaryPort}'/>
</TableRow>
<TableRow android:visibility='@{!TextUtils.isEmpty(viewModel.thirdHostSecondaryIp) ? View.VISIBLE : View.GONE}'>
<TextView style="@style/HostLabelStyle" android:text="Secondary IP"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.thirdHostSecondaryIp}'/>
</TableRow>
<TableRow android:visibility='@{!TextUtils.isEmpty(viewModel.thirdHostSecondaryPort) ? View.VISIBLE : View.GONE}'>
<TextView style="@style/HostLabelStyle" android:text="Secondary Port"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.thirdHostSecondaryPort}'/>
</TableRow>
<TableRow android:visibility='@{!TextUtils.isEmpty(viewModel.thirdHostCurrency) ? View.VISIBLE : View.GONE}'>
<TextView style="@style/HostLabelStyle" android:text="Currency"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.thirdHostCurrency}'/>
</TableRow>
</TableLayout>
<TextView
android:text="--------------------------------------------------------------------------"
android:gravity="left"
android:paddingVertical="8dp"
android:layout_height="wrap_content"
android:layout_width="match_parent"/>
</LinearLayout>
<!-- ===== QR HOST ===== -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility='@{!TextUtils.isEmpty(viewModel.secHostName) ? View.VISIBLE : View.GONE}'
tools:visibility="visible">
<TextView
android:text="QR HOST"
android:textSize="14sp"
style="@style/HostLabelStyle"
android:textStyle="bold"
android:fontFamily="@font/rubik_regular"
android:paddingTop="8dp"
android:layout_height="wrap_content"
android:layout_width="match_parent"/>
<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -274,40 +192,40 @@
android:text='@{": " + viewModel.secHostName}'/>
</TableRow>
<TableRow android:visibility='@{!TextUtils.isEmpty(viewModel.shortCode) ? View.VISIBLE : View.GONE}'>
<TableRow>
<TextView style="@style/HostLabelStyle" android:text="Short Code"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.shortCode}'/>
</TableRow>
<TableRow android:visibility='@{!TextUtils.isEmpty(viewModel.secHostPrimaryIp) ? View.VISIBLE : View.GONE}'>
<TableRow>
<TextView style="@style/HostLabelStyle" android:text="Primary IP"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.secHostPrimaryIp}'/>
</TableRow>
<TableRow android:visibility='@{!TextUtils.isEmpty(viewModel.secHostPrimaryPort) ? View.VISIBLE : View.GONE}'>
<TableRow>
<TextView style="@style/HostLabelStyle" android:text="Primary Port"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.secHostPrimaryPort}'/>
</TableRow>
<TableRow android:visibility='@{!TextUtils.isEmpty(viewModel.secHostSecondaryIp) ? View.VISIBLE : View.GONE}'>
<TableRow>
<TextView style="@style/HostLabelStyle" android:text="Secondary IP"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.secHostSecondaryIp}'/>
</TableRow>
<TableRow android:visibility='@{!TextUtils.isEmpty(viewModel.secHostSecondaryPort) ? View.VISIBLE : View.GONE}'>
<TableRow>
<TextView style="@style/HostLabelStyle" android:text="Secondary Port"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.secHostSecondaryPort}'/>
</TableRow>
<TableRow android:visibility='@{!TextUtils.isEmpty(viewModel.secHostCurrency) ? View.VISIBLE : View.GONE}'>
<TableRow>
<TextView style="@style/HostLabelStyle" android:text="Currency"/>
<TextView style="@style/HostValueStyle"
android:text='@{": " + viewModel.secHostCurrency}'/>
android:text='@{": " + viewModel.currencyCode}'/>
</TableRow>
</TableLayout>

12
baselib/src/main/java/com/utsmyanmar/baselib/network/model/sirius/SiriusHost.java
View File

@ -1,7 +1,5 @@
package com.utsmyanmar.baselib.network.model.sirius;
import com.google.gson.annotations.SerializedName;
public class SiriusHost {
private String id;
@ -11,8 +9,6 @@ public class SiriusHost {
private String primaryIP;
private String secondaryIP;
@SerializedName(value = "thirdIP", alternate = {"thirdIp", "tertiaryIP", "tertiaryIp"})
private String thirdIP;
private String currency;
@ -57,10 +53,6 @@ public class SiriusHost {
this.secondaryIP = secondaryIP;
}
public void setThirdIP(String thirdIP) {
this.thirdIP = thirdIP;
}
public void setCurrency(String currency) {
this.currency = currency;
}
@ -97,10 +89,6 @@ public class SiriusHost {
return secondaryIP;
}
public String getThirdIP() {
return thirdIP;
}
public String getCurrency() {
return currency;
}

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

@ -1068,28 +1068,15 @@ public abstract class BaseXPrint {
receiptHeader = SystemParamsOperation.getInstance().getReceiptHeader();
merchantAddress = SystemParamsOperation.getInstance().getMerchantAddress();
if (merchantAddress != null) {
// Support manual line breaks entered as escaped/newline sequences.
merchantAddress = merchantAddress
.replace("\\r\\n", "\n")
.replace("\\n", "\n")
.replace("\r\n", "\n");
if(merchantAddress != null){
//this step is needed for manually line break with \n in the Address
merchantAddress = merchantAddress.replace("\\n", "\n");
}
terminalName = SystemParamsOperation.getInstance().getTerminalName();
if (terminalName != null) {
// Keep behavior aligned with address wrapping for printed slips.
terminalName = terminalName
.replace("\\r\\n", "\n")
.replace("\\n", "\n")
.replace("\r\n", "\n");
}
assert merchantAddress != null;
List<String> result = wrapAddressText(merchantAddress, 29);
List<String> terminalLines = TextUtils.isEmpty(terminalName)
? new ArrayList<>()
: wrapAddressText(terminalName.trim(), 29);
if (receiptHeader == null || TextUtils.equals(receiptHeader, "") || receiptHeader.trim().isEmpty()) {
receiptHeader = merchantName;
@ -1097,13 +1084,11 @@ public abstract class BaseXPrint {
if (TextUtils.equals(merchantAddress, "")) {
merchantAddress = "";
}
if (TextUtils.equals(terminalName, "") || terminalName == null) {
if(TextUtils.equals(terminalName, "") || terminalName == null){
terminalName = "";
}
for (String line : terminalLines) {
printer.appendPrnStr(line, fontNormal, AlignEnum.CENTER, true);
}
printer.appendPrnStr(terminalName, fontNormal, AlignEnum.CENTER, true);
for (String line : result) {
//result get the List of text from auto/manually break the address
@ -1330,7 +1315,7 @@ public abstract class BaseXPrint {
dotBreak();
// ---------- SECONDARY HOST (optional) ----------
if (!TextUtils.isEmpty(sp.getSecHostName())) {
printer.appendPrnStr("QR HOST", fontNormal, AlignEnum.LEFT, true);
printer.appendPrnStr("SECONDARY HOST", fontNormal, AlignEnum.LEFT, true);
printer.appendPrnStr("Name : " + sp.getSecHostName(), fontNormal, AlignEnum.LEFT, false);
printer.appendPrnStr("SHORT CODE : " + sp.getShortCode(), fontNormal, AlignEnum.LEFT, false);
String[] secHostIp = splitIpAndPort(sp.getSecHostIpAddress());
@ -1339,26 +1324,10 @@ public abstract class BaseXPrint {
String[] secHostSecIp = splitIpAndPort(sp.getSecHostSecIpAddress());
printer.appendPrnStr("Secondary Ip : " + secHostSecIp[0], fontNormal, AlignEnum.LEFT, false);
printer.appendPrnStr("Secondary Port: " + secHostSecIp[1], fontNormal, AlignEnum.LEFT, false);
String qrHostCurrency = TextUtils.isEmpty(sp.getSecHostCurrency()) ? String.valueOf(sp.getCurrencyType()) : sp.getSecHostCurrency();
printer.appendPrnStr("Currency Code : " + qrHostCurrency, fontNormal, AlignEnum.LEFT, false);
printer.appendPrnStr("Currency Code : " + sp.getCurrencyType(), fontNormal, AlignEnum.LEFT, false);
dotBreak();
printer.appendPrnStr("App Version : " + getAppVersion(), fontNormal, AlignEnum.LEFT, false);
}
// ---------- THIRD HOST (optional) ----------
if (!TextUtils.isEmpty(sp.getThirdHostName())) {
printer.appendPrnStr("SECONDARY HOST", fontNormal, AlignEnum.LEFT, true);
printer.appendPrnStr("Name : " + sp.getThirdHostName(), fontNormal, AlignEnum.LEFT, false);
printer.appendPrnStr("SHORT CODE : " + sp.getThirdHostShortCode(), fontNormal, AlignEnum.LEFT, false);
String[] thirdHostIp = splitIpAndPort(sp.getThirdHostIpAddress());
printer.appendPrnStr("Primary Ip : " + thirdHostIp[0], fontNormal, AlignEnum.LEFT, false);
printer.appendPrnStr("Primary Port : " + thirdHostIp[1], fontNormal, AlignEnum.LEFT, false);
String[] thirdHostSecIp = splitIpAndPort(sp.getThirdHostSecIpAddress());
printer.appendPrnStr("Secondary Ip : " + thirdHostSecIp[0], fontNormal, AlignEnum.LEFT, false);
printer.appendPrnStr("Secondary Port: " + thirdHostSecIp[1], fontNormal, AlignEnum.LEFT, false);
printer.appendPrnStr("Currency Code : " + sp.getThirdHostCurrency(), fontNormal, AlignEnum.LEFT, false);
dotBreak();
}
}
private String getAppVersion() {

79
paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsOperation.java
View File

@ -1014,7 +1014,6 @@ public class SystemParamsOperation {
saveSystemParamsSettings(params);
}
public void setTmsAddress(String tmsAddress){
SystemParamsSettings params = getSystemParamsSettings();
params.setTmsAddress(tmsAddress);
@ -1037,7 +1036,6 @@ public class SystemParamsOperation {
return params.getSecIpAddress();
}
public int getPortAddress(){
SystemParamsSettings params = getSystemParamsSettings();
return params.getPortAddress();
@ -1346,44 +1344,22 @@ public class SystemParamsOperation {
saveSystemParamsSettings(params);
}
public void setThirdHostName(String hostName) {
SystemParamsSettings params = getSystemParamsSettings();
params.setThirdHostName(hostName);
saveSystemParamsSettings(params);
}
public String getSecHostName() {
SystemParamsSettings params = getSystemParamsSettings();
return params.getSecHostName();
}
public String getThirdHostName() {
SystemParamsSettings params = getSystemParamsSettings();
return params.getThirdHostName();
}
public void setSecHostIpAddress(String ipAddress) {
SystemParamsSettings params = getSystemParamsSettings();
params.setSecHostIpAddress(ipAddress);
saveSystemParamsSettings(params);
}
public void setThirdHostIpAddress(String ipAddress) {
SystemParamsSettings params = getSystemParamsSettings();
params.setThirdHostIpAddress(ipAddress);
saveSystemParamsSettings(params);
}
public String getSecHostIpAddress() {
SystemParamsSettings params = getSystemParamsSettings();
return params.getSecHostIpAddress();
}
public String getThirdHostIpAddress() {
SystemParamsSettings params = getSystemParamsSettings();
return params.getThirdHostIpAddress();
}
public void setTokenHostAddress(String tokenHostAddress) {
SystemParamsSettings params = getSystemParamsSettings();
params.setTokenHostAddress(tokenHostAddress);
@ -1411,78 +1387,39 @@ public class SystemParamsOperation {
saveSystemParamsSettings(params);
}
public void setThirdHostSecIpAddress(String ipAddress) {
SystemParamsSettings params = getSystemParamsSettings();
params.setThirdHostSecIpAddress(ipAddress);
saveSystemParamsSettings(params);
}
public String getSecHostSecIpAddress() {
SystemParamsSettings params = getSystemParamsSettings();
return params.getSecHostSecIpAddress();
}
public String getThirdHostSecIpAddress() {
SystemParamsSettings params = getSystemParamsSettings();
return params.getThirdHostSecIpAddress();
}
public void setSecHostTerminalId(String terminalId) {
SystemParamsSettings params = getSystemParamsSettings();
params.setSecHostTerminalId(terminalId);
saveSystemParamsSettings(params);
}
public void setThirdHostTerminalId(String terminalId) {
SystemParamsSettings params = getSystemParamsSettings();
params.setThirdHostTerminalId(terminalId);
saveSystemParamsSettings(params);
}
public String getSecHostTerminalId() {
SystemParamsSettings params = getSystemParamsSettings();
return params.getSecHostTerminalId();
}
public String getThirdHostTerminalId() {
SystemParamsSettings params = getSystemParamsSettings();
return params.getThirdHostTerminalId();
}
public void setSecHostMerchantId(String merchantId) {
SystemParamsSettings params = getSystemParamsSettings();
params.setSecHostMerchantId(merchantId);
saveSystemParamsSettings(params);
}
public void setThirdHostMerchantId(String merchantId) {
SystemParamsSettings params = getSystemParamsSettings();
params.setThirdHostMerchantId(merchantId);
saveSystemParamsSettings(params);
}
public void setShortCode(String shortCode) {
SystemParamsSettings params = getSystemParamsSettings();
params.setShortCode(shortCode);
saveSystemParamsSettings(params);
}
public void setThirdHostShortCode(String shortCode) {
SystemParamsSettings params = getSystemParamsSettings();
params.setThirdHostShortCode(shortCode);
saveSystemParamsSettings(params);
}
public String getShortCode() {
SystemParamsSettings params = getSystemParamsSettings();
return params.getShortCode();
}
public String getThirdHostShortCode() {
SystemParamsSettings params = getSystemParamsSettings();
return params.getThirdHostShortCode();
}
public void setBinValue(String value) {
SystemParamsSettings params = getSystemParamsSettings();
params.setBinValues(value);
@ -1500,11 +1437,6 @@ public class SystemParamsOperation {
return params.getSecHostMerchantId();
}
public String getThirdHostMerchantId() {
SystemParamsSettings params = getSystemParamsSettings();
return params.getThirdHostMerchantId();
}
public void setLastSuccessTrnx(String lastSuccessTrnx) {
SystemParamsSettings params = getSystemParamsSettings();
params.setLastSuccessTranx(lastSuccessTrnx);
@ -1522,22 +1454,11 @@ public class SystemParamsOperation {
saveSystemParamsSettings(params);
}
public void setThirdHostCurrency(String currency) {
SystemParamsSettings params = getSystemParamsSettings();
params.setThirdHostCurrency(currency);
saveSystemParamsSettings(params);
}
public String getSecHostCurrency() {
SystemParamsSettings params = getSystemParamsSettings();
return params.getSecHostCurrency();
}
public String getThirdHostCurrency() {
SystemParamsSettings params = getSystemParamsSettings();
return params.getThirdHostCurrency();
}
public String getCurrentSerialNum() {
SystemParamsSettings params = getSystemParamsSettings();
return params.getCurrentSerialNum();

37
paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java
View File

@ -102,29 +102,22 @@ public class SystemParamsSettings implements Serializable {
private String secHostId = "";
private String secHostName = "";
private String thirdHostName = "";
private String secHostIpAddress = "";
private String thirdHostIpAddress = "";
private String tokenHostAddress = "";
private String grantType = "";
private String secHostSecIpAddress = "";
private String thirdHostSecIpAddress = "";
private String secHostTerminalId = "";
private String thirdHostTerminalId = "";
private String secHostMerchantId = "";
private String thirdHostMerchantId = "";
private String shortCode = "";
private String thirdHostShortCode = "";
private String secHostCurrency = "";
private String thirdHostCurrency = "";
private String disabledMessage = "";
@ -285,38 +278,26 @@ public class SystemParamsSettings implements Serializable {
return secHostName;
}
protected String getThirdHostName() { return thirdHostName; }
protected String getSecHostIpAddress() {
return secHostIpAddress;
}
protected String getThirdHostIpAddress() { return thirdHostIpAddress; }
protected String getSecHostSecIpAddress() {
return secHostSecIpAddress;
}
protected String getThirdHostSecIpAddress() { return thirdHostSecIpAddress; }
protected String getSecHostTerminalId() {
return secHostTerminalId;
}
protected String getThirdHostTerminalId() { return thirdHostTerminalId; }
protected String getSecHostMerchantId() {
return secHostMerchantId;
}
protected String getThirdHostMerchantId() { return thirdHostMerchantId; }
protected String getSecHostCurrency() {
return secHostCurrency;
}
protected String getThirdHostCurrency() { return thirdHostCurrency; }
protected String getAuthToken() { return authToken;}
protected String getEreceiptAddress() { return ereceiptAddress; }
@ -342,14 +323,10 @@ public class SystemParamsSettings implements Serializable {
this.secHostName = secHostName;
}
protected void setThirdHostName(String thirdHostName) { this.thirdHostName = thirdHostName; }
protected void setSecHostIpAddress(String secHostIpAddress) {
this.secHostIpAddress = secHostIpAddress;
}
protected void setThirdHostIpAddress(String thirdHostIpAddress) { this.thirdHostIpAddress = thirdHostIpAddress; }
protected void setBinValues(String binValues) {
this.binValues = binValues;
}
@ -402,14 +379,10 @@ public class SystemParamsSettings implements Serializable {
this.shortCode = shortCode;
}
protected void setThirdHostShortCode(String thirdHostShortCode) { this.thirdHostShortCode = thirdHostShortCode; }
protected String getShortCode() {
return this.shortCode;
}
protected String getThirdHostShortCode() { return this.thirdHostShortCode; }
protected long getuPiCvMLimit() {
return this.uPiCvMLimit;
}
@ -442,14 +415,10 @@ public class SystemParamsSettings implements Serializable {
this.secHostSecIpAddress = secHostSecIpAddress;
}
protected void setThirdHostSecIpAddress(String thirdHostSecIpAddress) { this.thirdHostSecIpAddress = thirdHostSecIpAddress; }
protected void setSecHostTerminalId(String secHostTerminalId) {
this.secHostTerminalId = secHostTerminalId;
}
protected void setThirdHostTerminalId(String thirdHostTerminalId) { this.thirdHostTerminalId = thirdHostTerminalId; }
protected void setLastSuccessTranx(String lastSuccessTranx) {
this.lastSuccessTranx = lastSuccessTranx;
}
@ -462,14 +431,10 @@ public class SystemParamsSettings implements Serializable {
this.secHostMerchantId = secHostMerchantId;
}
protected void setThirdHostMerchantId(String thirdHostMerchantId) { this.thirdHostMerchantId = thirdHostMerchantId; }
protected void setSecHostCurrency(String secHostCurrency) {
this.secHostCurrency = secHostCurrency;
}
protected void setThirdHostCurrency(String thirdHostCurrency) { this.thirdHostCurrency = thirdHostCurrency; }
protected void setNeedSettlement(boolean needSettlement) {
this.isNeedSettlement = needSettlement;
}
@ -705,7 +670,6 @@ public class SystemParamsSettings implements Serializable {
protected void setSecIpAddress(String secIpAddress){ this.secIpAddress = secIpAddress;}
protected void setHostReadTimeout(String hostReadTimeout){ this.hostReadTimeout = hostReadTimeout;}
protected void setReversalDelay(String reversalDelay) { this.reversalDelay = reversalDelay; }
@ -720,7 +684,6 @@ public class SystemParamsSettings implements Serializable {
protected String getSecIpAddress(){ return secIpAddress;}
protected String getComp1() {
return comp1;
}