From 6f16607efe766271c69a4f3f96fb928fe25f112c Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期五, 01 十一月 2019 16:22:13 +0800
Subject: [PATCH] 2019-11-01-2
---
ZigbeeApp/Shared/Phone/Device/Light/LightControl.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Light/LightControl.cs b/ZigbeeApp/Shared/Phone/Device/Light/LightControl.cs
index 3e280d9..946630a 100755
--- a/ZigbeeApp/Shared/Phone/Device/Light/LightControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Light/LightControl.cs
@@ -121,10 +121,10 @@
}
if (deviceUI.CommonDevice.Type == DeviceType.OnOffOutput)
{
- if ((common as ToggleLight).DeviceStatusReport.CluterID == 6)
+ if (common.DeviceStatusReport.CluterID == 6)
{
var light = deviceUI.CommonDevice as ToggleLight;
- light.DeviceStatusReport = (common as ToggleLight).DeviceStatusReport;
+ light.DeviceStatusReport = common.DeviceStatusReport;
//璁板綍銆佹洿鏂扮姸鎬�
if (light.DeviceStatusReport.AttriBute == null || light.DeviceStatusReport.AttriBute.Count == 0)
{
@@ -475,12 +475,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