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

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs

@@ -72,7 +72,7 @@
        /// <param name="i_listDevice">设备对象</param>

        public void InitControl(string i_caption, List<ZigBee.Device.CommonDevice> i_listDevice)

        {

            var room = Common.Room.CurrentRoom.GetRoomById(i_listDevice[0].DeviceRoomId);

            var room = Common.LocalDevice.Current.GeteRealDeviceRoom(i_listDevice[0]);

            this.InitControl(i_caption, room);

        }