新云端代码Ver1.2

黄学彪

2020-12-16 0d9f64668fd7350d6a21fd157e32009a96d98134

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

@@ -74,7 +74,7 @@
                        }
                    }

                    var device = LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
                    var device = HdlDeviceCommonLogic.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
                    if (device == null)
                    {
                        continue;
@@ -190,7 +190,7 @@
                    var bList = curControlDev.bindTargetsFromMutilfunctionPanelList[key];
                    foreach (var bDev in bList)
                    {
                        var device = LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
                        var device = HdlDeviceCommonLogic.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
                        if (device == null)
                        {
                            continue;
@@ -308,7 +308,7 @@
                        }
                    }

                    var device = LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
                    var device = HdlDeviceCommonLogic.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
                    if (device == null)
                    {
                        continue;
@@ -442,7 +442,7 @@
                {
                    foreach (var de in room.ListDevice)
                    {
                        var device = LocalDevice.Current.GetDevice(de);
                        var device = HdlDeviceCommonLogic.Current.GetDevice(de);
                        if (device != null)
                        {
                            var tempDev = curBindTypeList.Find(obj => obj.BindMacAddr + obj.BindEpoint == device.DeviceAddr + device.DeviceEpoint);
@@ -627,7 +627,7 @@
                }
                foreach (var deviceKeys in r.ListDevice)
                {
                    var device = LocalDevice.Current.GetDevice(deviceKeys);
                    var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
                    if (device == null)
                    {
                        continue;
@@ -760,7 +760,7 @@
            List<CommonDevice> UndistributeCommonDeviceListTemp = new List<CommonDevice>();

            //获取本地设备列表
            foreach (var tempDev in Shared.Common.LocalDevice.Current.listAllDevice)
            foreach (var tempDev in HdlDeviceCommonLogic.Current.listAllDevice)
            {
                //获取设备所属房间
                var tempDevRoom = HdlRoomLogic.Current.GetRoomByDevice(tempDev);
@@ -874,11 +874,11 @@
            List<CommonDevice> curRoomDeviceListTemp = new List<CommonDevice>();
            foreach (var deviceKeys in curRoom.ListDevice)
            {
                var device = LocalDevice.Current.GetDevice(deviceKeys);
                var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
                if (device != null)
                {
                    //获取设备类型的
                    var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
                    var deviceEnumInfo = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
                    var tempDev = curBindTypeList.Find(obj => obj.BindMacAddr + obj.BindEpoint == device.DeviceAddr + device.DeviceEpoint);
                    if (tempDev != null)
                    {
@@ -918,7 +918,7 @@
                        case 4:
                            if (device.Type == DeviceType.WindowCoveringDevice)
                            {
                                if (deviceEnumInfo.ConcreteType != Common.DeviceConcreteType.ButtonPanel_SimpleMultifunction)
                                if (deviceEnumInfo.ConcreteType != DeviceConcreteType.ButtonPanel_SimpleMultifunction)
                                {
                                    curRoomDeviceListTemp.Add(device);
                                }