2020-06-24 1.增加干节点指令处理。 （干节点0 移动传感器1 煤气传感器10 烟雾传感器11 水浸25 门磁...

JLChen

2020-06-24 f9d01e2084e5b53840b09f557b4e2c700c790d80

 hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Parser/DeviceParser.java

@@ -599,7 +599,18 @@
                appliancesInfo.setDeviceName("传感器 功率");
                appliancesInfo.setDeviceType(HDLApConfig.TYPE_SENSOR_POWER);
                break;

            case 25:
                appliancesInfo.setDeviceName("传感器 水浸");
                appliancesInfo.setDeviceType(HDLApConfig.TYPE_SENSOR_FLOODING);
                break;
            case 26:
                appliancesInfo.setDeviceName("传感器 门磁窗磁");
                appliancesInfo.setDeviceType(HDLApConfig.TYPE_SENSOR_DOOR_MAGNET);
                break;
            case 27:
                appliancesInfo.setDeviceName("传感器 紧急按钮");
                appliancesInfo.setDeviceType(HDLApConfig.TYPE_SENSOR_EMERGENCY_BUTTON);
                break;

            default:
                appliancesInfo.setDeviceName(Configuration.UNKNOW_TYPE);
@@ -611,8 +622,9 @@
            appliancesInfo.setLittleType(littleType);
//            appliancesInfo.setCtrlCommand(Configuration.LOGIC_CTRL_COMMAND);
//            appliancesInfo.setCtrlBackCommand(Configuration.LOGIC_CTRL_BACK_COMMAND);
            appliancesInfo.setStateCommand(Configuration.SENSOR_STATE_COMMAND);
            appliancesInfo.setStateBackCommand(Configuration.SENSOR_STATE_BACK_COMMAND);

//            appliancesInfo.setStateCommand(Configuration.SENSOR_STATE_COMMAND);
//            appliancesInfo.setStateBackCommand(Configuration.SENSOR_STATE_BACK_COMMAND);
            appliancesInfo.setDeviceSubnetID(devicesData.getSourceSubnetID());
            appliancesInfo.setDeviceDeviceID(devicesData.getSourceDeviceID());
            appliancesInfo.setParentRemarks(parentRemarks);
@@ -620,6 +632,16 @@
            appliancesInfo.setIpAddress(ipAddress);


            if (littleType == 0 || littleType == 1 || littleType == 10 ||  littleType == 11 || littleType == 25 || littleType == 26 || littleType == 27) {
                //干节点0 移动传感器1 煤气传感器10 烟雾传感器11 水浸25 门磁窗磁26 紧急按钮27
                appliancesInfo.setStateCommand(Configuration.DRY_CONTACT_STATE_COMMAND);
                appliancesInfo.setStateBackCommand(Configuration.DRY_CONTACT_STATE_BACK_COMMAND);
            } else {
                appliancesInfo.setStateCommand(Configuration.SENSOR_STATE_COMMAND);
                appliancesInfo.setStateBackCommand(Configuration.SENSOR_STATE_BACK_COMMAND);

            }

        }