Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-10-29 45e4e387f3ef259b9e225fdd543e20be285a5112

 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)
                                {