|
@ -133,9 +133,9 @@ public class VenueSceneUtils { |
|
|
padConfig.getExtension().getPadSetting() != null && |
|
|
padConfig.getExtension().getPadSetting() != null && |
|
|
padConfig.getExtension().getPadSetting().isGateEnterOpenEnable(); |
|
|
padConfig.getExtension().getPadSetting().isGateEnterOpenEnable(); |
|
|
|
|
|
|
|
|
gateConfig.gateEnterOpenEnable = padConfig.getExtension() != null && |
|
|
|
|
|
|
|
|
gateConfig.gateAbEnable = padConfig.getExtension() != null && |
|
|
padConfig.getExtension().getPadSetting() != null && |
|
|
padConfig.getExtension().getPadSetting() != null && |
|
|
padConfig.getExtension().getPadSetting().gateAbEnable(); |
|
|
|
|
|
|
|
|
padConfig.getExtension().getPadSetting().isGateAbEnable(); |
|
|
|
|
|
|
|
|
gateConfig.gateAbGpio = padConfig.getExtension() != null && |
|
|
gateConfig.gateAbGpio = padConfig.getExtension() != null && |
|
|
padConfig.getExtension().getPadSetting() != null && |
|
|
padConfig.getExtension().getPadSetting() != null && |
|
@ -144,16 +144,13 @@ public class VenueSceneUtils { |
|
|
gateConfig.gateAbUdp = padConfig.getExtension() != null && |
|
|
gateConfig.gateAbUdp = padConfig.getExtension() != null && |
|
|
padConfig.getExtension().getPadSetting() != null && |
|
|
padConfig.getExtension().getPadSetting() != null && |
|
|
padConfig.getExtension().getPadSetting().isGateAbUdp(); |
|
|
padConfig.getExtension().getPadSetting().isGateAbUdp(); |
|
|
|
|
|
|
|
|
// 添加gate_open_enable配置 |
|
|
|
|
|
|
|
|
// 添加gate_open_enable配置 |
|
|
gateConfig.gateOpenEnable = padConfig.getExtension() != null && |
|
|
gateConfig.gateOpenEnable = padConfig.getExtension() != null && |
|
|
padConfig.getExtension().getPadSetting() != null && |
|
|
padConfig.getExtension().getPadSetting() != null && |
|
|
padConfig.getExtension().getPadSetting().isGateOpenEnable(); |
|
|
padConfig.getExtension().getPadSetting().isGateOpenEnable(); |
|
|
|
|
|
|
|
|
Log.d(TAG, "门禁配置 - EnterOpenEnable: " + gateConfig.gateEnterOpenEnable + |
|
|
Log.d(TAG, "门禁配置 - EnterOpenEnable: " + gateConfig.gateEnterOpenEnable + |
|
|
", AbGpio: " + gateConfig.gateAbGpio + |
|
|
", AbGpio: " + gateConfig.gateAbGpio + |
|
|
", AbUdp: " + gateConfig.gateAbUdp + |
|
|
|
|
|
", OpenEnable: " + gateConfig.gateOpenEnable); |
|
|
|
|
|
|
|
|
", AbUdp: " + gateConfig.gateAbUdp); |
|
|
|
|
|
|
|
|
return gateConfig; |
|
|
return gateConfig; |
|
|
} else { |
|
|
} else { |
|
@ -170,18 +167,19 @@ public class VenueSceneUtils { |
|
|
* 门禁配置信息类 |
|
|
* 门禁配置信息类 |
|
|
*/ |
|
|
*/ |
|
|
public static class GateConfig { |
|
|
public static class GateConfig { |
|
|
public boolean gateEnterOpenEnable = false; // 门禁进入开启使能 |
|
|
|
|
|
|
|
|
public boolean gateEnterOpenEnable = false; // 门禁进入开启使能?暂时未知 |
|
|
public boolean gateAbGpio = false; // 门禁AB GPIO |
|
|
public boolean gateAbGpio = false; // 门禁AB GPIO |
|
|
public boolean gateAbUdp = false; // 门禁AB UDP |
|
|
public boolean gateAbUdp = false; // 门禁AB UDP |
|
|
public boolean gateOpenEnable = false; // 离场核销直接开门使能 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public boolean gateAbEnable = false; // ab门总开关 |
|
|
|
|
|
public boolean gateOpenEnable = false; //离场核销直接开门 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public String toString() { |
|
|
public String toString() { |
|
|
return "GateConfig{" + |
|
|
return "GateConfig{" + |
|
|
"gateEnterOpenEnable=" + gateEnterOpenEnable + |
|
|
|
|
|
|
|
|
"gateOpenEnable=" + gateOpenEnable + |
|
|
", gateAbGpio=" + gateAbGpio + |
|
|
", gateAbGpio=" + gateAbGpio + |
|
|
", gateAbUdp=" + gateAbUdp + |
|
|
", gateAbUdp=" + gateAbUdp + |
|
|
", gateOpenEnable=" + gateOpenEnable + |
|
|
|
|
|
'}'; |
|
|
'}'; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|