Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

 ZigbeeApp/Shared/Phone/Device/AirSwitch/AirSwitchControl.cs

@@ -126,10 +126,10 @@
                        }
                        if (deviceUI.CommonDevice.Type == DeviceType.AirSwitch)
                        {
                            if ((common as ZigBee.Device.AirSwitch).DeviceStatusReport.CluterID == 6)
                            if (common.DeviceStatusReport.CluterID == 6)
                            {
                                var airSwitch = deviceUI.CommonDevice as ZigBee.Device.AirSwitch;
                                airSwitch.DeviceStatusReport = (common as ZigBee.Device.AirSwitch).DeviceStatusReport;
                                airSwitch.DeviceStatusReport = common.DeviceStatusReport;
                                //记录、更新状态
                                if (airSwitch.DeviceStatusReport.AttriBute == null || airSwitch.DeviceStatusReport.AttriBute.Count == 0)
                                {
@@ -140,7 +140,7 @@
                                airSwitch.LastDateTime = DateTime.Now;
                            }
                            //***新改***设备状态上报中，当CluterID=3,证明设备在线，直接标记
                            else if ((common as ZigBee.Device.AirSwitch).DeviceStatusReport.CluterID == 3)
                            else if (common.DeviceStatusReport.CluterID == 3)
                            {
                                var airSwitch = deviceUI.CommonDevice as ZigBee.Device.AirSwitch;
                                airSwitch.IsOnline = 1;