Compare commits
No commits in common. "a5ce7dc8e50f76a7d28d5d7c4b210c7dc7a25e2b" and "e929f63618527dcc13f78733d78bc2d88930b9d8" have entirely different histories.
a5ce7dc8e5
...
e929f63618
@ -595,10 +595,6 @@ public class TMSSetupsImpl implements TMSSetups{
|
||||
if(!data.isEmpty()){
|
||||
SystemParamsOperation.getInstance().setUpiTerminalCapability(data);
|
||||
}
|
||||
} else if (TextUtils.equals(name, "jcb_terminal_capability")) {
|
||||
if(!data.isEmpty()){
|
||||
SystemParamsOperation.getInstance().setJcbTerminalCapability(data);
|
||||
}
|
||||
}else if (TextUtils.equals(name,"upi_ttq")) {
|
||||
emvParamOperation.updateQuickPassTTQ(data);
|
||||
} else if (TextUtils.equals(name, "upi_tc_enabled")) {
|
||||
|
||||
@ -574,7 +574,6 @@ public abstract class EmvBaseViewModel extends BaseViewModel {
|
||||
String visaTerminalCapability = SystemParamsOperation.getInstance().getVisaTerminalCapability();
|
||||
String masterTerminalCapability = SystemParamsOperation.getInstance().getMasterTerminalCapability();
|
||||
String upiTerminalCapability = SystemParamsOperation.getInstance().getUpiTerminalCapability();
|
||||
String jcbTerminalCapability = SystemParamsOperation.getInstance().getJcbTerminalCapability();
|
||||
|
||||
|
||||
String selectedTerminalCapability = "";
|
||||
@ -592,10 +591,8 @@ public abstract class EmvBaseViewModel extends BaseViewModel {
|
||||
// UPI
|
||||
selectedTerminalCapability = upiTerminalCapability;
|
||||
} else if (aidStr.contains("A00000006510") || aidStr.contains("A0000001570040")) {
|
||||
// UPI (maybe JCB)
|
||||
selectedTerminalCapability = jcbTerminalCapability;
|
||||
} else if (aidStr.contains("A000000065")){
|
||||
selectedTerminalCapability = jcbTerminalCapability;
|
||||
// UPI
|
||||
selectedTerminalCapability = "E0F8C8";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -681,12 +681,6 @@ public class SystemParamsOperation {
|
||||
saveSystemParamsSettings(params);
|
||||
}
|
||||
|
||||
public void setJcbTerminalCapability(String jcbTerminalCapability){
|
||||
SystemParamsSettings params = getSystemParamsSettings();
|
||||
params.setJcbTerminalCapability(jcbTerminalCapability);
|
||||
saveSystemParamsSettings(params);
|
||||
}
|
||||
|
||||
public String getVisaTerminalCapability(){
|
||||
SystemParamsSettings params = getSystemParamsSettings();
|
||||
return params.getVisaTerminalCapability();
|
||||
@ -700,11 +694,6 @@ public class SystemParamsOperation {
|
||||
return params.getUpiTerminalCapability();
|
||||
}
|
||||
|
||||
public String getJcbTerminalCapability() {
|
||||
SystemParamsSettings params = getSystemParamsSettings();
|
||||
return params.getJcbTerminalCapability();
|
||||
}
|
||||
|
||||
public void setAuthToken(String authToken) {
|
||||
SystemParamsSettings params = getSystemParamsSettings();
|
||||
params.setAuthToken(authToken);
|
||||
@ -1937,6 +1926,4 @@ public class SystemParamsOperation {
|
||||
SystemParamsSettings params = getSystemParamsSettings();
|
||||
return params.getAutoReversalEnable();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -55,7 +55,7 @@ public class SystemParamsSettings implements Serializable {
|
||||
private String visaTerminalCapability = "E028C8";
|
||||
private String masterTerminalCapability = "E068C8";
|
||||
private String upiTerminalCapability = "E068C8";
|
||||
private String jcbTerminalCapability = "E0F8C8";
|
||||
|
||||
private String ipAddress = "";
|
||||
|
||||
private String secIpAddress = "";
|
||||
@ -1188,14 +1188,6 @@ public class SystemParamsSettings implements Serializable {
|
||||
return autoReversalEnable;
|
||||
}
|
||||
|
||||
public String getJcbTerminalCapability() {
|
||||
return jcbTerminalCapability;
|
||||
}
|
||||
|
||||
public void setJcbTerminalCapability(String jcbTerminalCapability){
|
||||
this.jcbTerminalCapability = jcbTerminalCapability;
|
||||
}
|
||||
|
||||
/* // 流水号起始
|
||||
private String serialNum = Configs.getInstance().SERIAL_NUM();
|
||||
// 批次号起始
|
||||
|
||||
Loading…
Reference in New Issue
Block a user