合并了全部的代码

黄学彪

2019-10-18 97e259d966cb5cb5d73c105d5dbaadcc1f920614

 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs

@@ -975,7 +975,7 @@
        /// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
        private void GoToAddGateWay(object sender, MouseEventArgs mouseEventArgs)
        {
            var selectNewGateWayForm = new UserCenter.GatewayAdd.NewGateWaySelectForm { };
            var selectNewGateWayForm = new UserCenter.GatewayAdd.NewGateWayMenuSelectForm { };
            selectNewGateWayForm.AddForm(selectNewGateWayForm);
        }

@@ -1073,12 +1073,12 @@
                    {
                        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;
                        }
                        if (Room.CurrentRoom.IsLove)