From 081ea8d273048fd03756718ac6fb48a3c09218e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 13:10:00 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC

---
 ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs b/ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs
index 02e5698..5dd0ba7 100644
--- 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)
                                 {

--
Gitblit v1.8.0