From 8b4d79ca03495e522a1953e04ca17527f33c853a Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期一, 28 十月 2019 13:22:17 +0800 Subject: [PATCH] 合并完成代码 --- ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs b/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs index 7cdecac..5dd0ba7 100755 --- a/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs +++ b/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs @@ -120,10 +120,10 @@ } if (deviceUI.CommonDevice.Type == DeviceType.DimmableLight) { - if ((common as DimmableLight).DeviceStatusReport.CluterID == 6) + if (common.DeviceStatusReport.CluterID == 6) { dimmableLight = deviceUI.CommonDevice as DimmableLight; - dimmableLight.DeviceStatusReport = (common as DimmableLight).DeviceStatusReport; + dimmableLight.DeviceStatusReport = common.DeviceStatusReport; //璁板綍銆佹洿鏂扮姸鎬� if (dimmableLight.DeviceStatusReport.AttriBute == null || dimmableLight.DeviceStatusReport.AttriBute.Count == 0) { @@ -146,10 +146,10 @@ dimmableLight.LastDateTime = DateTime.Now; } //浜害 - if ((common as ZigBee.Device.DimmableLight).DeviceStatusReport.CluterID == 8) + if (common.DeviceStatusReport.CluterID == 8) { dimmableLight = deviceUI.CommonDevice as ZigBee.Device.DimmableLight; - dimmableLight.DeviceStatusReport = (common as ZigBee.Device.DimmableLight).DeviceStatusReport; + dimmableLight.DeviceStatusReport = common.DeviceStatusReport; var attriButeList = dimmableLight.DeviceStatusReport.AttriBute; if (attriButeList == null || attriButeList.Count == 0) { @@ -531,12 +531,12 @@ //collection if ((sender as Button).IsSelected) { - Shared.Common.Room.GetLoveRoom().DeleteDevice(device.FileName); + Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(device.FileName); (sender as Button).IsSelected = false; } else { - Shared.Common.Room.GetLoveRoom().AddDevice(device.FileName); + Shared.Common.Room.CurrentRoom.GetLoveRoom().AddDevice(device.FileName); (sender as Button).IsSelected = true; } } -- Gitblit v1.8.0