合并了晾衣架(非新云端)

黄学彪

2020-12-14 e90209beae6a4e822cecb18e6889f8bda23f630e

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

@@ -486,7 +486,7 @@
                        }
                        foreach (var deviceKeys in r.ListDevice)
                        {
                            var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
                            var device = LocalDevice.Current.GetDevice(deviceKeys);
                            if (device != null)
                            {
                                var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 6));
@@ -511,7 +511,7 @@
                        }
                        foreach (var deviceKeys in r.ListDevice)
                        {
                            var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
                            var device = LocalDevice.Current.GetDevice(deviceKeys);
                            if (device != null)
                            {
                                var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 8));
@@ -536,7 +536,7 @@
                        }
                        foreach (var deviceKeys in r.ListDevice)
                        {
                            var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
                            var device = LocalDevice.Current.GetDevice(deviceKeys);
                            if (device != null)
                            {
                                var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 258));
@@ -566,7 +566,7 @@
                case "AddSwitch":
                    foreach (var deviceKeys in curRoom.ListDevice)
                    {
                        var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
                        var device = LocalDevice.Current.GetDevice(deviceKeys);
                        if (device != null)
                        {
                            var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 6));
@@ -580,7 +580,7 @@
                case "AddDimmer":
                    foreach (var deviceKeys in curRoom.ListDevice)
                    {
                        var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
                        var device = LocalDevice.Current.GetDevice(deviceKeys);
                        if (device != null)
                        {
                            var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 8));
@@ -594,7 +594,7 @@
                case "AddCurtain":
                    foreach (var deviceKeys in curRoom.ListDevice)
                    {
                        var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
                        var device = LocalDevice.Current.GetDevice(deviceKeys);
                        if (device != null)
                        {
                            var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 258));
@@ -641,7 +641,7 @@
                    TextColor = Shared.Common.ZigbeeColor.Current.TextBlack,
                    TextAlignment = TextAlignment.CenterLeft,
                    Tag = device.DeviceEpointName,
                    Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device),
                    Text = Common.LocalDevice.Current.GetDeviceEpointName(device),
                    TextSize = 15,
                };
                rowLayout.AddChidren(btnBindName);