Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-10 c0021397eeb8335d6d1f20990c71533c3d94e7af

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

@@ -91,10 +91,10 @@
        /// </summary>
        public void Show()
        {
            RemoveAll();
            InitData();
            AddTop();
            AddBodyView();

        }

        /// <summary>