From 47675876dbc24ea2fa54a1f4090f1a998ed2e5cf Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期五, 06 八月 2021 16:18:11 +0800 Subject: [PATCH] 2021-08-06 1.配合海克传感器,调整处理模拟量传感器状态 --- hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java | 70 +++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java index a2a9f11..c35cd63 100644 --- a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java +++ b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java @@ -1255,6 +1255,76 @@ // } + + /** + * 鑾峰彇骞叉帴鐐逛紶鎰熷櫒妯″潡鐘舵�� + * + * @param info + */ + public static void getSensorStateFromNetwork(final AppliancesInfo info) { + if (info == null) { + return; + } + HDLDeviceManager.isGetDeviceStateSuccess = false; + switch (info.getDeviceType()) { +// case HDLApConfig.TYPE_SENSOR_DRY_CONTACT: +// case HDLApConfig.TYPE_SENSOR_MOVEMENT_DETECTOR: + case HDLApConfig.TYPE_SENSOR_TEMP: + case HDLApConfig.TYPE_SENSOR_HUMIDITY: + case HDLApConfig.TYPE_SENSOR_ILLUMINACE: + case HDLApConfig.TYPE_SENSOR_VOC: + case HDLApConfig.TYPE_SENSOR_PM_2_POINT_5: + case HDLApConfig.TYPE_SENSOR_C02: + case HDLApConfig.TYPE_SENSOR_LPG: +// case HDLApConfig.TYPE_SENSOR_CO_H2: + case HDLApConfig.TYPE_SENSOR_CH4: +// case HDLApConfig.TYPE_SENSOR_SMOG: + case HDLApConfig.TYPE_SENSOR_WIND_SPEED: + case HDLApConfig.TYPE_SENSOR_WIND_PRESSURE: + case HDLApConfig.TYPE_SENSOR_LIQUID_FLOW: + case HDLApConfig.TYPE_SENSOR_LIQUID_PRESSURE: + case HDLApConfig.TYPE_SENSOR_LIQUID_DEPTH: + case HDLApConfig.TYPE_SENSOR_RAIN_FALL: + case HDLApConfig.TYPE_SENSOR_WEIGHT: + case HDLApConfig.TYPE_SENSOR_HEIGHT_LENGTH: + case HDLApConfig.TYPE_SENSOR_OBJECT_SPEED: + case HDLApConfig.TYPE_SENSOR_SHAKE: + case HDLApConfig.TYPE_SENSOR_VOLTAGE: + case HDLApConfig.TYPE_SENSOR_ELECTRICITY: + case HDLApConfig.TYPE_SENSOR_POWER: +// case HDLApConfig.TYPE_SENSOR_FLOODING: +// case HDLApConfig.TYPE_SENSOR_DOOR_MAGNET: +// case HDLApConfig.TYPE_SENSOR_EMERGENCY_BUTTON: + //鍙戦�佽幏浼犳劅鍣ㄦā鍧� 妯℃嫙閲忕姸鎬佹暟鎹� + byte[] sendDatabyte = new byte[]{ + (byte) info.getBigType(), + (byte) info.getLittleType(), + (byte) info.getChannelNum() + }; + + addSendData(info, sendDatabyte, Configuration.STATE); + break; + // 涓嬮潰鐨勯兘鏄敤骞茶妭鐐规寚浠� + case HDLApConfig.TYPE_SENSOR_DRY_CONTACT: //骞茶妭鐐� + case HDLApConfig.TYPE_SENSOR_MOVEMENT_DETECTOR: //绾㈠鎰熷簲浼犳劅鍣� + case HDLApConfig.TYPE_SENSOR_CO_H2: //鐓ゆ皵浼犳劅鍣� + case HDLApConfig.TYPE_SENSOR_SMOG: //鐑熼浘浼犳劅鍣� + case HDLApConfig.TYPE_SENSOR_FLOODING: //姘存蹈浼犳劅鍣� + case HDLApConfig.TYPE_SENSOR_DOOR_MAGNET: //闂ㄧ浼犳劅鍣� + case HDLApConfig.TYPE_SENSOR_EMERGENCY_BUTTON://绱ф�ユ寜閽� + //鍙戦�佽幏浼犳劅鍣ㄦā鍧� 骞茶妭鐐圭姸鎬佹暟鎹� + byte[] sendDatabyte2 = new byte[]{ + (byte) 1, + (byte) info.getChannelNum() + }; + addSendData(info, sendDatabyte2, Configuration.STATE); + break; + default: + HDLLog.info("涓嶆槸浼犳劅鍣ㄦā鍧�"); + break; + } + } + /** * 鑾峰彇骞叉帴鐐逛紶鎰熷櫒妯″潡鐘舵�� * -- Gitblit v1.8.0