合并代码

黄学彪

2020-01-06 72be4f06a683de33ddd563c8447c39f7f17e5b7d

 ZigbeeApp/Shared/Phone/Device/Light/DimmableLightControl.cs

@@ -314,7 +314,7 @@
            UserView.HomePage.Instance.AddChidren(detailInfo);
            UserView.HomePage.Instance.PageIndex += 1;
            detailInfo.Show(device, room);
            detailInfo.action = () =>
            detailInfo.EditAction = (d,r) =>
            {
                Show(device, room);
            };
@@ -448,6 +448,8 @@

            InitProgressBtn(itemView);

            InitProgressBtn(itemView);

            switchBtn = new Button()
            {
                Y = Application.GetRealHeight(1005),