Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

 ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs

@@ -73,6 +73,7 @@


                //彩灯,调光器类型的深度卡片界面

                var form = new ControlForm.DeviceColorLightDetailCardForm();

                form.RowOrCardControl = this;

                form.AddForm(i_device, this.nowSelectRoom, 965, 1316);

                form.FormCloseEvent += this.CardDetailInfoBackEvent;

            };