Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 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>