删除了郭雪城的 DeviceUi 这个类

黄学彪

2020-03-06 a5b3c4bae726ef6770d4bfcbf2f4b50a37ed4a15

 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs

@@ -58,7 +58,7 @@
        /// <summary>
        /// 当前设备类型列表
        /// </summary>
        List<DeviceUI> curTypeDeviceList = new List<DeviceUI> { };
        List<CommonDevice> curTypeDeviceList = new List<CommonDevice> { };
        /// <summary>
        /// 当前设备绑定类型
        /// </summary>
@@ -82,7 +82,7 @@
        /// <summary>
        /// 当前按键的所有房间设备列表
        /// </summary>
        List<DeviceUI> currentKeyAllRoomDeviceList = new List<DeviceUI>();
        List<CommonDevice> currentKeyAllRoomDeviceList = new List<CommonDevice>();
        /// <summary>
        /// 临时存储的目标列表
        /// </summary>
@@ -221,14 +221,15 @@

            #region 数据处理
            //获取楼层
            dicFloor = Common.Room.CurrentRoom.GetFloorSortList();
            dicFloor = HdlRoomLogic.Current.GetFloorSortList();
            currentKey.currentSelectFloorId = BindInfo.GetCurrentSelectFloorId();
            btnFloorText.Text = BindInfo.GetCurrentSelectFloorIdName();

            if (Common.Config.Instance.Home.FloorDics.Count == 0)
            {
                // 获取没有楼层房间
                foreach (var room in Shared.Common.Room.Lists)
                var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
                foreach (var room in listAllRoom)
                {
                    if (string.IsNullOrEmpty(room.FloorId))
                    {
@@ -239,7 +240,8 @@
            else
            {
                // 获取楼层对应对房间
                foreach (var room in Shared.Common.Room.Lists)
                var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
                foreach (var room in listAllRoom)
                {
                    if (room.FloorId == currentKey.currentSelectFloorId)
                    {
@@ -255,13 +257,13 @@
                {
                    foreach (var devA in currentKeyAllRoomDeviceList)
                    {
                        var id = devA.CommonDevice?.DeviceAddr + devA.CommonDevice?.DeviceEpoint;
                        var id = devA.DeviceAddr + devA.DeviceEpoint;
                        var dev = currentKey.bindList.Find(obj => (obj != null) && (obj.BindMacAddr + obj.BindEpoint == id));
                        if (dev != null)
                        {
                            if (!oldTargetList.ContainsKey(id))
                            {
                                oldTargetList.Add(id, devA.CommonDevice);
                                oldTargetList.Add(id, devA);
                            }
                        }
                    }
@@ -453,15 +455,16 @@
        /// 当前按键所有显示房间的所有设备处理
        /// </summary>
        /// <returns></returns>
        List<DeviceUI> GetALlDispalyRoomDeviceList()
        List<CommonDevice> GetALlDispalyRoomDeviceList()
        {
            currentKeyAllRoomDeviceList.Clear();
            var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
            switch (curDeviceBindType)
            {
                case "AddSwitch":
                    foreach (var r in Shared.Common.Room.Lists)
                    foreach (var r in listAllRoom)
                    {
                        if (r.DeviceUIList.Count == 0)
                        if (r.ListDevice.Count == 0)
                        {
                            continue;
                        }
@@ -469,11 +472,12 @@
                        {
                            continue;
                        }
                        foreach (var device in r.DeviceUIList)
                        foreach (var deviceKeys in r.ListDevice)
                        {
                            if (device.CommonDevice != null)
                            var device = LocalDevice.Current.GetDevice(deviceKeys);
                            if (device != null)
                            {
                                var dev = device.CommonDevice.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 6));
                                var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 6));
                                if (dev != null)
                                {
                                    currentKeyAllRoomDeviceList.Add(device);
@@ -483,9 +487,9 @@
                    }
                    break;
                case "AddDimmer":
                    foreach (var r in Shared.Common.Room.Lists)
                    foreach (var r in listAllRoom)
                    {
                        if (r.DeviceUIList.Count == 0)
                        if (r.ListDevice.Count == 0)
                        {
                            continue;
                        }
@@ -493,11 +497,12 @@
                        {
                            continue;
                        }
                        foreach (var device in r.DeviceUIList)
                        foreach (var deviceKeys in r.ListDevice)
                        {
                            if (device.CommonDevice != null)
                            var device = LocalDevice.Current.GetDevice(deviceKeys);
                            if (device != null)
                            {
                                var dev = device.CommonDevice.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 8));
                                var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 8));
                                if (dev != null)
                                {
                                    currentKeyAllRoomDeviceList.Add(device);
@@ -507,9 +512,9 @@
                    }
                    break;
                case "AddCurtain":
                    foreach (var r in Shared.Common.Room.Lists)
                    foreach (var r in listAllRoom)
                    {
                        if (r.DeviceUIList.Count == 0)
                        if (r.ListDevice.Count == 0)
                        {
                            continue;
                        }
@@ -517,11 +522,12 @@
                        {
                            continue;
                        }
                        foreach (var device in r.DeviceUIList)
                        foreach (var deviceKeys in r.ListDevice)
                        {
                            if (device.CommonDevice != null)
                            var device = LocalDevice.Current.GetDevice(deviceKeys);
                            if (device != null)
                            {
                                var dev = device.CommonDevice.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 258));
                                var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 258));
                                if (dev != null)
                                {
                                    currentKeyAllRoomDeviceList.Add(device);
@@ -546,11 +552,12 @@
            switch (curDeviceBindType)
            {
                case "AddSwitch":
                    foreach (var device in curRoom.DeviceUIList)
                    foreach (var deviceKeys in curRoom.ListDevice)

                    {
                        if (device.CommonDevice != null)
                        var device = LocalDevice.Current.GetDevice(deviceKeys);

                        if (device != null)
                        {
                            var dev = device.CommonDevice.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 6));
                            var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 6));
                            if (dev != null)
                            {
                                curTypeDeviceList.Add(device);
@@ -559,11 +566,12 @@
                    }
                    break;
                case "AddDimmer":
                    foreach (var device in curRoom.DeviceUIList)
                    foreach (var deviceKeys in curRoom.ListDevice)

                    {
                        if (device.CommonDevice != null)
                        var device = LocalDevice.Current.GetDevice(deviceKeys);

                        if (device != null)
                        {
                            var dev = device.CommonDevice.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 8));
                            var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 8));
                            if (dev != null)
                            {
                                curTypeDeviceList.Add(device);
@@ -572,11 +580,12 @@
                    }
                    break;
                case "AddCurtain":
                    foreach (var device in curRoom.DeviceUIList)
                    foreach (var deviceKeys in curRoom.ListDevice)

                    {
                        if (device.CommonDevice != null)
                        var device = LocalDevice.Current.GetDevice(deviceKeys);

                        if (device != null)
                        {
                            var dev = device.CommonDevice.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 258));
                            var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 258));
                            if (dev != null)
                            {
                                curTypeDeviceList.Add(device);
@@ -589,7 +598,7 @@
            foreach (var device in curTypeDeviceList)
            {
                curIndex++;
                if (device.CommonDevice != null && device.CommonDevice.IsOnline == 0)
                if (device != null && device.IsOnline == 0)
                {
                    continue;
                }
@@ -598,7 +607,7 @@
                {
                    Height = Application.GetRealHeight(23 + 127),
                    BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
                    Tag = device.CommonDevice?.DeviceEpointName,
                    Tag = device.DeviceEpointName,
                };
                midVerticalScrolViewLayout.AddChidren(rowLayout);

@@ -609,7 +618,7 @@
                    Width = Application.GetMinRealAverage(81),
                    Height = Application.GetMinRealAverage(81),
                    UnSelectedImagePath = device.IconPath,
                    Tag = device.CommonDevice?.DeviceEpointName,
                    Tag = device.DeviceEpointName,
                };
                rowLayout.AddChidren(devicePic);

@@ -619,7 +628,7 @@
                    X = devicePic.Right + Application.GetRealWidth(20),
                    TextColor = Shared.Common.ZigbeeColor.Current.TextBlack,
                    TextAlignment = TextAlignment.CenterLeft,
                    Tag = device.CommonDevice?.DeviceEpointName,
                    Tag = device.DeviceEpointName,
                    TextSize = 15,
                };
                rowLayout.AddChidren(btnBindName);
@@ -633,7 +642,7 @@
                    SelectedImagePath = "DoorLock/SelectedIcon.png",
                    TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
                    Visible = false,
                    Tag = device.CommonDevice?.DeviceEpointName,
                    Tag = device.DeviceEpointName,
                };
                rowLayout.AddChidren(btnChoose);

@@ -659,7 +668,7 @@

                    if (!btnChoose.IsSelected)
                    {
                        targetList.Remove(device.CommonDevice);
                        targetList.Remove(device);
                        btnChoose.IsSelected = false;
                        btnChoose.Visible = false;
                    }
@@ -671,7 +680,7 @@
                        }
                        else
                        {
                            targetList.Add(device.CommonDevice);
                            targetList.Add(device);
                            btnChoose.IsSelected = true;
                            btnChoose.Visible = true;
                        }
@@ -692,17 +701,17 @@
                btnBindName.MouseUpEventHandler += hander;
                btnChoose.MouseUpEventHandler += hander;

                if (string.IsNullOrEmpty(device.CommonDevice?.DeviceEpointName))
                if (string.IsNullOrEmpty(device.DeviceEpointName))
                {
                    btnBindName.Text = device.CommonDevice?.DeviceAddr + "_" + device.CommonDevice?.DeviceEpoint;
                    btnBindName.Text = device.DeviceAddr + "_" + device.DeviceEpoint;
                }
                else
                {
                    btnBindName.Text = device.CommonDevice?.DeviceEpointName;
                    btnBindName.Text = device.DeviceEpointName;
                }
                foreach (var bindedDev in targetList)
                {
                    var id = device.CommonDevice?.DeviceAddr + device.CommonDevice?.DeviceEpoint;
                    var id = device.DeviceAddr + device.DeviceEpoint;
                    if (id == bindedDev.DeviceAddr + bindedDev.DeviceEpoint)
                    {
                        btnChoose.IsSelected = true;
@@ -841,7 +850,8 @@
                    }

                    //获取楼层对应的房间
                    foreach (var room in Shared.Common.Room.Lists)
                    var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
                    foreach (var room in listAllRoom)
                    {
                        if (room.FloorId == currentKey.currentSelectFloorId)
                        {