2020-03-17-1

WJC

2020-03-17 f6e34a69f1d1e0b0b3a6252fe20acddca7fe56e5

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

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

        public void InitControl(string i_caption, ZigBee.Device.CommonDevice i_device)

        {

            var room = Common.Room.CurrentRoom.GetRoomByDevice(i_device);

            var room = HdlRoomLogic.Current.GetRoomByDevice(i_device);

            this.InitControl(i_caption, room);

        }



@@ -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);

        }



@@ -158,10 +158,10 @@
        /// </summary>

        private void InitData()

        {

            var dicFloor = Common.Room.CurrentRoom.GetFloorSortList();

            var dicFloor = HdlRoomLogic.Current.GetFloorSortList();

            if (dicFloor.Count == 0)

            {

                var listRoom = Common.Room.CurrentRoom.GetFloorSortRoom(string.Empty, false);

                var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(string.Empty, false);

                if (listRoom.Count > 0)

                {

                    //房间名字和主键收集

@@ -180,7 +180,7 @@
            {

                foreach (string fKeys in dicFloor.Keys)

                {

                    var listRoom = Common.Room.CurrentRoom.GetFloorSortRoom(fKeys, false);

                    var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(fKeys, false);

                    if (listRoom.Count > 0)

                    {

                        //楼层名字和主键收集