Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs

@@ -45,6 +45,14 @@

        }

        public override void RemoveFromParent()

        {

            HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");

            HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");



            base.RemoveFromParent();

        }

        #region Add____________________________________

        /// <summary>