全部合并了代码，安卓和 IOS 都测试通过了

黄学彪

2019-11-13 8b9ce384b26c414db32f98e94e088f5334869c2d

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

@@ -191,8 +191,8 @@
        {
            ZbGateway.StatusList.Remove(this);
            UserView.HomePage.Instance.ScrollEnabled = true;
            action();
            action = null;
            //action();
            //action = null;
            base.RemoveFromParent();
        }

@@ -531,12 +531,12 @@
            //collection
            if ((sender as Button).IsSelected)
            {
                Shared.Common.Room.GetLoveRoom().DeleteDevice(device.FileName);
                Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(device.FileName);
                (sender as Button).IsSelected = false;
            }
            else
            {
                Shared.Common.Room.GetLoveRoom().AddDevice(device.FileName);
                Shared.Common.Room.CurrentRoom.GetLoveRoom().AddDevice(device.FileName);
                (sender as Button).IsSelected = true;
            }
        }