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

fix - sec ip empty

Browse Source
This commit is contained in:
MooN 2025-11-24 08:46:49 +06:30
parent 49b929ab27
commit c619166ea8
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -237,15 +237,21 @@ public class TMSSetupsImpl implements TMSSetups{
} else if(siriusHost.getPrimaryIP().trim().isEmpty()) { } else if(siriusHost.getPrimaryIP().trim().isEmpty()) {
SystemParamsOperation.getInstance().setIpAddress(""); SystemParamsOperation.getInstance().setIpAddress("");
} }
String secondaryIp = siriusHost.getSecondaryIP();
if (siriusHost.getSecondaryIP().contains(":")) { if(secondaryIp == null || secondaryIp.trim().isEmpty()){
SystemParamsOperation.getInstance().setSecIpAddress(siriusHost.getSecondaryIP().trim());
} else if(siriusHost.getSecondaryIP().trim().isEmpty()){
SystemParamsOperation.getInstance().setSecIpAddress(""); 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()) { if (!siriusHost.getCurrency().isEmpty()) {
SystemParamsOperation.getInstance().setCurrencyType(currencyTextToCurrencyType(siriusHost.getCurrency())); SystemParamsOperation.getInstance().setCurrencyType(currencyTextToCurrencyType(siriusHost.getCurrency()));

10
app/src/main/java/com/utsmm/kbz/util/tms/TMSUtil.java
View File

@ -233,7 +233,7 @@ public class TMSUtil {
String secHostIp = SystemParamsOperation.getInstance().getSecIpAddress(); String secHostIp = SystemParamsOperation.getInstance().getSecIpAddress();
String keyIndex = SystemParamsOperation.getInstance().getTMKIndex(); String keyIndex = SystemParamsOperation.getInstance().getTMKIndex();
if(tid.length() == 8 && mid.length() == 15 && !hostIp.isEmpty() && !secHostIp.isEmpty() && !keyIndex.isEmpty()) { if(tid.length() == 8 && mid.length() == 15 && !hostIp.isEmpty() && !keyIndex.isEmpty()) {
tmsValidity = new TMSValidity(ValidityStatus.SUCCESS,"Success"); tmsValidity = new TMSValidity(ValidityStatus.SUCCESS,"Success");
} else if(tid.length() != 8) { } else if(tid.length() != 8) {
tmsValidity = new TMSValidity(ValidityStatus.FAILURE,"Tid is invalid!"); tmsValidity = new TMSValidity(ValidityStatus.FAILURE,"Tid is invalid!");
@ -241,9 +241,11 @@ public class TMSUtil {
tmsValidity = new TMSValidity(ValidityStatus.FAILURE,"Mid is invalid!"); tmsValidity = new TMSValidity(ValidityStatus.FAILURE,"Mid is invalid!");
} else if(hostIp.isEmpty()) { } else if(hostIp.isEmpty()) {
tmsValidity = new TMSValidity(ValidityStatus.FAILURE,"Pri-Ip is invalid!"); tmsValidity = new TMSValidity(ValidityStatus.FAILURE,"Pri-Ip is invalid!");
} else if(secHostIp.isEmpty()) { }
tmsValidity = new TMSValidity(ValidityStatus.FAILURE,"Sec-Ip is invalid!"); // else if(secHostIp.isEmpty()) {
} else { // tmsValidity = new TMSValidity(ValidityStatus.FAILURE,"Sec-Ip is invalid!");
// }
else {
tmsValidity = new TMSValidity(ValidityStatus.FAILURE,"KeyIndex is invalid!"); tmsValidity = new TMSValidity(ValidityStatus.FAILURE,"KeyIndex is invalid!");
} }

2
gradle.properties
View File

@ -8,7 +8,7 @@
# The setting is particularly useful for tweaking memory settings. # The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=1024m -Dfile.encoding=UTF-8 org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=1024m -Dfile.encoding=UTF-8
# Force Gradle to use system Java instead of Android Studio's JBR # Force Gradle to use system Java instead of Android Studio's JBR
org.gradle.java.home=/Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home #org.gradle.java.home=/Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home
#org.gradle.java.home=C:\\Program Files\\Microsoft\\jdk-17.0.16.8-hotspot #org.gradle.java.home=C:\\Program Files\\Microsoft\\jdk-17.0.16.8-hotspot
# Enable parallel builds and configure cache # Enable parallel builds and configure cache