From 60fea1a35f8bfd2eb1399cae05d853b93b3674f9 Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期五, 03 一月 2020 13:47:35 +0800 Subject: [PATCH] 2020-01-03 1.增加信mqtt网关设备类型支持。 2.住宅ID改为string类型。 --- Crabtree/SmartHome/UI/SimpleControl/Phone/DoorLock/FingerprintAndProximityScene.cs | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/DoorLock/FingerprintAndProximityScene.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/DoorLock/FingerprintAndProximityScene.cs index 0f10274..fe524ce 100644 --- a/Crabtree/SmartHome/UI/SimpleControl/Phone/DoorLock/FingerprintAndProximityScene.cs +++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/DoorLock/FingerprintAndProximityScene.cs @@ -696,6 +696,9 @@ if (common.Type == DeviceType.OnePortWirelessFR) { var gateWay = Newtonsoft.Json.JsonConvert.DeserializeObject<OnePortWirelessFR> (gateWayString); mac = gateWay.MAC.Replace (".", ""); + } else if (common.Type == DeviceType.OnePortMqttFR) { + var gateWay = Newtonsoft.Json.JsonConvert.DeserializeObject<OnePortMqttFR> (gateWayString); + mac = gateWay.MAC.Replace (".", ""); } else if (common.Type == DeviceType.OnePortBus) { var gateWay = Newtonsoft.Json.JsonConvert.DeserializeObject<OnePortBus> (gateWayString); mac = gateWay.MAC.Replace (".", ""); @@ -769,6 +772,9 @@ if (common.Type == DeviceType.OnePortWirelessFR) { var gateWay = Newtonsoft.Json.JsonConvert.DeserializeObject<OnePortWirelessFR> (gateWayString); mac = gateWay.MAC.Replace (".", ""); + } else if (common.Type == DeviceType.OnePortMqttFR) { + var gateWay = Newtonsoft.Json.JsonConvert.DeserializeObject<OnePortMqttFR> (gateWayString); + mac = gateWay.MAC.Replace (".", ""); } else if (common.Type == DeviceType.OnePortBus) { var gateWay = Newtonsoft.Json.JsonConvert.DeserializeObject<OnePortBus> (gateWayString); mac = gateWay.MAC.Replace (".", ""); -- Gitblit v1.8.0