新云端Ver1.3

黄学彪

2020-12-17 9f326f4000847e6167d8166fa2f6a66f53cb3734

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

@@ -7,6 +7,9 @@
using static ZigBee.Device.Panel;
namespace Shared.Phone.UserCenter.DeviceBind
{
    /// <summary>
    /// 普通面板的绑定设备界面【可绑定多个设备】
    /// </summary>
    public class AddDevicePage : BindCommonLayout
    {
        /// 构造函数
@@ -375,7 +378,7 @@
                var btnRoom = new Button
                {
                    Height = Application.GetRealHeight(58),
                    Width = Application.GetRealWidth(127),
                    Width = Application.GetRealWidth(255),
                    Y = Application.GetRealHeight(58),
                    X = Application.GetRealWidth(14),
                    Text = room.Name,
@@ -393,7 +396,7 @@
                    curentOldRoom = btnRoom;
                    curentOldRoomFrameLayout = btnRoomFrameLayout;
                }
                if (index == roomTempList.Count - 1 && index > 3)
                if (index == roomTempList.Count - 1 && index > 2)
                {
                    var btnRoomFrameLayoutEmpty = new FrameLayout
                    {
@@ -483,7 +486,7 @@
                        }
                        foreach (var deviceKeys in r.ListDevice)
                        {
                            var device = LocalDevice.Current.GetDevice(deviceKeys);
                            var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
                            if (device != null)
                            {
                                var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 6));
@@ -508,7 +511,7 @@
                        }
                        foreach (var deviceKeys in r.ListDevice)
                        {
                            var device = LocalDevice.Current.GetDevice(deviceKeys);
                            var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
                            if (device != null)
                            {
                                var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 8));
@@ -533,7 +536,7 @@
                        }
                        foreach (var deviceKeys in r.ListDevice)
                        {
                            var device = LocalDevice.Current.GetDevice(deviceKeys);
                            var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
                            if (device != null)
                            {
                                var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 258));
@@ -563,7 +566,7 @@
                case "AddSwitch":
                    foreach (var deviceKeys in curRoom.ListDevice)
                    {
                        var device = LocalDevice.Current.GetDevice(deviceKeys);
                        var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
                        if (device != null)
                        {
                            var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 6));
@@ -577,7 +580,7 @@
                case "AddDimmer":
                    foreach (var deviceKeys in curRoom.ListDevice)
                    {
                        var device = LocalDevice.Current.GetDevice(deviceKeys);
                        var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
                        if (device != null)
                        {
                            var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 8));
@@ -591,7 +594,7 @@
                case "AddCurtain":
                    foreach (var deviceKeys in curRoom.ListDevice)
                    {
                        var device = LocalDevice.Current.GetDevice(deviceKeys);
                        var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
                        if (device != null)
                        {
                            var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 258));
@@ -638,7 +641,7 @@
                    TextColor = Shared.Common.ZigbeeColor.Current.TextBlack,
                    TextAlignment = TextAlignment.CenterLeft,
                    Tag = device.DeviceEpointName,
                    Text = Common.LocalDevice.Current.GetDeviceEpointName(device),
                    Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device),
                    TextSize = 15,
                };
                rowLayout.AddChidren(btnBindName);