删除了郭雪城的 DeviceUi 这个类

黄学彪

2020-03-06 a5b3c4bae726ef6770d4bfcbf2f4b50a37ed4a15

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueEnvironmentTargetForm.cs

@@ -86,7 +86,7 @@


            HdlThreadLogic.Current.RunThread(() =>

            {

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

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

                var listDataRoom = new List<Common.Room>();

                for (int i = 0; i < listRoom.Count; i++)

                {

@@ -120,7 +120,7 @@
        private void InitTopRightMenuControl()

        {

            //获取楼层

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

            var dicFloor = HdlRoomLogic.Current.GetFloorSortList();

            if (dicFloor.Count == 0)

            {

                return;

@@ -288,9 +288,9 @@
            //先清空

            this.dicShowDevice[room.Id] = new List<CommonDevice>();



            foreach (var deviceUi in room.DeviceUIList)

            foreach (var deviceKeys in room.ListDevice)

            {

                var device = deviceUi.CommonDevice;

                var device = Common.LocalDevice.Current.GetDevice(deviceKeys);

                if (device != null)

                {

                    canShow = true;