Merge branch 'duel_settlement' of https://hub.utsmyanmar.com/Kyaw_Min_Khant/KBZ-POS into duel_settlement

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

@@ -595,7 +595,11 @@ public class TMSSetupsImpl implements TMSSetups{
                 if(!data.isEmpty()){
                     SystemParamsOperation.getInstance().setUpiTerminalCapability(data);
                 }
-            }else if (TextUtils.equals(name,"upi_ttq")) {
+            } 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")) {
                 SystemParamsOperation.getInstance().setUpiTCEnabled(parseBoolean(data));

baselib/src/main/java/com/utsmyanmar/baselib/viewModel/EmvBaseViewModel.java

@@ -574,6 +574,7 @@ 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 = "";
@@ -591,8 +592,10 @@ public abstract class  EmvBaseViewModel extends BaseViewModel {
                     // UPI
                     selectedTerminalCapability = upiTerminalCapability;
                 } else if (aidStr.contains("A00000006510") || aidStr.contains("A0000001570040")) {
-                    // UPI
-                    selectedTerminalCapability = "E0F8C8";
+                    // UPI (maybe JCB)
+                    selectedTerminalCapability = jcbTerminalCapability;
+                } else if (aidStr.contains("A000000065")){
+                    selectedTerminalCapability = jcbTerminalCapability;
                 }
             }
             

paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsOperation.java

@@ -681,6 +681,12 @@ 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();
@@ -693,6 +699,11 @@ public class SystemParamsOperation {
         SystemParamsSettings params = getSystemParamsSettings();
         return params.getUpiTerminalCapability();
     }
+    
+    public String getJcbTerminalCapability() {
+        SystemParamsSettings params = getSystemParamsSettings();
+        return params.getJcbTerminalCapability();
+    }
 
     public void setAuthToken(String authToken) {
         SystemParamsSettings params = getSystemParamsSettings();
@@ -1926,4 +1937,6 @@ public class SystemParamsOperation {
         SystemParamsSettings params = getSystemParamsSettings();
         return params.getAutoReversalEnable();
     }
+
+
 }

paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java

@@ -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,6 +1188,14 @@ 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();
     // 批次号起始