From 1c4904d77f484c075080942d87785481b52b6fb2 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 28 十月 2019 14:58:46 +0800
Subject: [PATCH] Revert "Merge branch 'dev-tzy' into DEV_GXC"

---
 ZigbeeApp/Shared/Phone/UserView/UserPage.cs |   44 ++++++++++++++++++++++----------------------
 1 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
index bcfbb8e..5c086d8 100644
--- a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
@@ -89,10 +89,10 @@
                         {
                             case DeviceType.OnOffOutput:
                                 //寮�鍏冲姛鑳�
-                                if (common.DeviceStatusReport.CluterID == 6)
+                                if ((common as ZigBee.Device.ToggleLight).DeviceStatusReport.CluterID == 6)
                                 {
                                     var onOffOutputLight = deviceUI.CommonDevice as ZigBee.Device.ToggleLight;
-                                    onOffOutputLight.DeviceStatusReport = common.DeviceStatusReport;
+                                    onOffOutputLight.DeviceStatusReport = (common as ZigBee.Device.ToggleLight).DeviceStatusReport;
                                     //璁板綍銆佹洿鏂扮姸鎬�
                                     if (onOffOutputLight.DeviceStatusReport.AttriBute == null || onOffOutputLight.DeviceStatusReport.AttriBute.Count == 0)
                                     {
@@ -103,7 +103,7 @@
                                     onOffOutputLight.LastDateTime = DateTime.Now;
                                 }
                                 //褰揅luterID=3,灏辫瘉鏄庤璁惧鍦ㄧ嚎锛岀洿鎺ユ爣璁�
-                                if (common.DeviceStatusReport.CluterID == 3)
+                                if ((common as ZigBee.Device.ToggleLight).DeviceStatusReport.CluterID == 3)
                                 {
                                     var onOffOutputLight = deviceUI.CommonDevice as ToggleLight;
                                     onOffOutputLight.IsOnline = 1;
@@ -114,10 +114,10 @@
 
                             case DeviceType.AirSwitch:
                                 //寮�鍏冲姛鑳�
-                                if (common.DeviceStatusReport.CluterID == 6)
+                                if ((common as ZigBee.Device.AirSwitch).DeviceStatusReport.CluterID == 6)
                                 {
                                     var airSwitch = deviceUI.CommonDevice as ZigBee.Device.AirSwitch;
-                                    airSwitch.DeviceStatusReport = common.DeviceStatusReport;
+                                    airSwitch.DeviceStatusReport = (common as ZigBee.Device.AirSwitch).DeviceStatusReport;
                                     //璁板綍銆佹洿鏂扮姸鎬�
                                     if (airSwitch.DeviceStatusReport.AttriBute == null || airSwitch.DeviceStatusReport.AttriBute.Count == 0)
                                     {
@@ -129,7 +129,7 @@
 
                                 }
                                 //褰揅luterID=3,灏辫瘉鏄庤璁惧鍦ㄧ嚎锛岀洿鎺ユ爣璁�
-                                if (common.DeviceStatusReport.CluterID == 3)
+                                if ((common as ZigBee.Device.AirSwitch).DeviceStatusReport.CluterID == 3)
                                 {
                                     var airSwitch = deviceUI.CommonDevice as AirSwitch;
                                     airSwitch.IsOnline = 1;
@@ -139,10 +139,10 @@
                                 break;
 
                             case DeviceType.WindowCoveringDevice:
-                                if (common.DeviceStatusReport.CluterID == 258)
+                                if ((common as ZigBee.Device.Rollershade).DeviceStatusReport.CluterID == 258)
                                 {
                                     var rollershade = deviceUI.CommonDevice as ZigBee.Device.Rollershade;
-                                    rollershade.DeviceStatusReport = common.DeviceStatusReport;
+                                    rollershade.DeviceStatusReport = (common as ZigBee.Device.Rollershade).DeviceStatusReport;
                                     var attriButeList = rollershade.DeviceStatusReport.AttriBute;
                                     if (attriButeList == null || attriButeList.Count == 0)
                                     {
@@ -156,7 +156,7 @@
                                             break;
                                     }
                                 }
-                                if (common.DeviceStatusReport.CluterID == 3)
+                                if ((common as ZigBee.Device.Rollershade).DeviceStatusReport.CluterID == 3)
                                 {
                                     var rollershade = deviceUI.CommonDevice as ZigBee.Device.Rollershade;
                                     rollershade.IsOnline = 1;
@@ -167,10 +167,10 @@
 
                             case DeviceType.Thermostat:
                                 //AC鍔熻兘
-                                if (common.DeviceStatusReport.CluterID == 513)
+                                if ((common as ZigBee.Device.AC).DeviceStatusReport.CluterID == 513)
                                 {
                                     var ac = deviceUI.CommonDevice as ZigBee.Device.AC;
-                                    ac.DeviceStatusReport = common.DeviceStatusReport;
+                                    ac.DeviceStatusReport = (common as ZigBee.Device.AC).DeviceStatusReport;
                                     var attriButeList = ac.DeviceStatusReport.AttriBute;
                                     if (attriButeList == null || attriButeList.Count == 0)
                                     {
@@ -213,7 +213,7 @@
 
                                 }
                                 //褰揅luterID=3,灏辫瘉鏄庤璁惧鍦ㄧ嚎锛岀洿鎺ユ爣璁�
-                                if (common.DeviceStatusReport.CluterID == 3)
+                                if ((common as ZigBee.Device.AC).DeviceStatusReport.CluterID == 3)
                                 {
                                     var ac = deviceUI.CommonDevice as AC;
                                     ac.IsOnline = 1;
@@ -226,10 +226,10 @@
                             case DeviceType.DimmableLight:
                                 //璋冨厜鐏姛鑳�
                                 //寮�鍏冲姛鑳�
-                                if (common.DeviceStatusReport.CluterID == 6)
+                                if ((common as ZigBee.Device.DimmableLight).DeviceStatusReport.CluterID == 6)
                                 {
                                     var dimmableLight = deviceUI.CommonDevice as ZigBee.Device.DimmableLight;
-                                    dimmableLight.DeviceStatusReport = common.DeviceStatusReport;
+                                    dimmableLight.DeviceStatusReport = (common as ZigBee.Device.DimmableLight).DeviceStatusReport;
                                     //璁板綍銆佹洿鏂扮姸鎬�
                                     if (dimmableLight.DeviceStatusReport.AttriBute == null || dimmableLight.DeviceStatusReport.AttriBute.Count == 0)
                                     {
@@ -240,10 +240,10 @@
                                     dimmableLight.LastDateTime = DateTime.Now;
                                 }
                                 //浜害
-                                if (common.DeviceStatusReport.CluterID == 8)
+                                if ((common as ZigBee.Device.DimmableLight).DeviceStatusReport.CluterID == 8)
                                 {
                                     var dimmableLight = deviceUI.CommonDevice as ZigBee.Device.DimmableLight;
-                                    dimmableLight.DeviceStatusReport = common.DeviceStatusReport;
+                                    dimmableLight.DeviceStatusReport = (common as ZigBee.Device.DimmableLight).DeviceStatusReport;
                                     var attriButeList = dimmableLight.DeviceStatusReport.AttriBute;
                                     if (attriButeList == null || attriButeList.Count == 0)
                                     {
@@ -259,7 +259,7 @@
                                     }
                                 }
                                 //褰揅luterID=3,灏辫瘉鏄庤璁惧鍦ㄧ嚎锛岀洿鎺ユ爣璁�
-                                if (common.DeviceStatusReport.CluterID == 3)
+                                if ((common as ZigBee.Device.DimmableLight).DeviceStatusReport.CluterID == 3)
                                 {
                                     var dimmableLight = deviceUI.CommonDevice as DimmableLight;
                                     dimmableLight.IsOnline = 1;
@@ -297,31 +297,31 @@
                         {
                             case DeviceType.OnOffOutput:
                                 var onOffOutputLight = deviceUI.CommonDevice as ToggleLight;
-                                onOffOutputLight.IsOnline = common.IsOnline;
+                                onOffOutputLight.IsOnline = (common as ToggleLight).IsOnline;
                                 //璁板綍鍥炲鏃堕棿
                                 onOffOutputLight.LastDateTime = DateTime.Now;
                                 break;
                             case DeviceType.AirSwitch:
                                 var airSwitch = deviceUI.CommonDevice as AirSwitch;
-                                airSwitch.IsOnline = common.IsOnline;
+                                airSwitch.IsOnline = (common as AirSwitch).IsOnline;
                                 //璁板綍鍥炲鏃堕棿
                                 airSwitch.LastDateTime = DateTime.Now;
                                 break;
                             case DeviceType.WindowCoveringDevice:
                                 var rollershade = deviceUI.CommonDevice as ZigBee.Device.Rollershade;
-                                rollershade.IsOnline = common.IsOnline;
+                                rollershade.IsOnline = (common as Rollershade).IsOnline;
                                 //璁板綍鍥炲鏃堕棿
                                 rollershade.LastDateTime = DateTime.Now;
                                 break;
                             case DeviceType.Thermostat:
                                 var ac = deviceUI.CommonDevice as ZigBee.Device.AC;
-                                ac.IsOnline = common.IsOnline;
+                                ac.IsOnline = (common as ZigBee.Device.AC).IsOnline;
                                 //璁板綍鍥炲鏃堕棿
                                 ac.LastDateTime = DateTime.Now;
                                 break;
                             case DeviceType.DimmableLight:
                                 var dimmableLight = deviceUI.CommonDevice as ZigBee.Device.DimmableLight;
-                                dimmableLight.IsOnline = common.IsOnline;
+                                dimmableLight.IsOnline = (common as ZigBee.Device.DimmableLight).IsOnline;
                                 //璁板綍鍥炲鏃堕棿
                                 dimmableLight.LastDateTime = DateTime.Now;
                                 break;

--
Gitblit v1.8.0