xm
2020-04-29 07466c19110693e3e439a7d7c8ad0bc21d9b3287
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs
old mode 100644 new mode 100755
@@ -234,8 +234,8 @@
                }
            }
            else
            {
                // 获取楼层对应对房间
            {
                // 获取楼层对应对房间
                var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
                foreach (var room in listAllRoom)
                {
@@ -453,7 +453,7 @@
        /// <returns></returns>
        List<CommonDevice> GetALlDispalyRoomDeviceList()
        {
            currentKeyAllRoomDeviceList.Clear();
            currentKeyAllRoomDeviceList.Clear();
            var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
            switch (curDeviceBindType)
            {
@@ -492,7 +492,7 @@
                        if (r.IsLove == true)
                        {
                            continue;
                        }
                        }
                        foreach (var deviceKeys in r.ListDevice)
                        {
                            var device = LocalDevice.Current.GetDevice(deviceKeys);
@@ -548,9 +548,9 @@
            switch (curDeviceBindType)
            {
                case "AddSwitch":
                    foreach (var deviceKeys in curRoom.ListDevice)
                    {
                        var device = LocalDevice.Current.GetDevice(deviceKeys);
                    foreach (var deviceKeys in curRoom.ListDevice)
                    {
                        var device = LocalDevice.Current.GetDevice(deviceKeys);
                        if (device != null)
                        {
                            var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 6));
@@ -561,10 +561,10 @@
                        }
                    }
                    break;
                case "AddDimmer":
                    foreach (var deviceKeys in curRoom.ListDevice)
                    {
                        var device = LocalDevice.Current.GetDevice(deviceKeys);
                case "AddDimmer":
                    foreach (var deviceKeys in curRoom.ListDevice)
                    {
                        var device = LocalDevice.Current.GetDevice(deviceKeys);
                        if (device != null)
                        {
                            var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 8));
@@ -575,10 +575,10 @@
                        }
                    }
                    break;
                case "AddCurtain":
                    foreach (var deviceKeys in curRoom.ListDevice)
                    {
                        var device = LocalDevice.Current.GetDevice(deviceKeys);
                case "AddCurtain":
                    foreach (var deviceKeys in curRoom.ListDevice)
                    {
                        var device = LocalDevice.Current.GetDevice(deviceKeys);
                        if (device != null)
                        {
                            var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 258));
@@ -839,9 +839,9 @@
                        btnMethodText.IsSelected = true;
                        oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                        oldbuttonText.IsBold = true;
                    }
                    //获取楼层对应的房间
                    }
                    //获取楼层对应的房间
                    var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
                    foreach (var room in listAllRoom)
                    {