完全合并了Wjc，Xm 的 代码

黄学彪

2019-10-24 31497bb69602433d94c8a28ea01c3ee3c7cc8576

 ZigbeeApp/Shared/Phone/Device/AirSwitch/AirSwitchControl.cs

@@ -204,7 +204,7 @@
        public override void RemoveFromParent()
        {
            ZbGateway.StatusList.Remove(this);
            action();
            action?.Invoke();
            RemoveUpdateControlDeviceStatuAction();
            base.RemoveFromParent();
        }
@@ -490,7 +490,6 @@
                Shared.Common.Room.Lists[0].AddDevice(device.FileName);
                collectionBtn.IsSelected = true;
            }
            action?.Invoke();
        }

        /// <summary>