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

黄学彪

2020-12-14 e90209beae6a4e822cecb18e6889f8bda23f630e

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs

@@ -443,7 +443,7 @@
                {
                    //被绑定设备图片【可能和外面设备等图片不同，因为这里是以功能来绑定的】
                    //devicePic.UnSelectedImagePath = tempDev.IconPath;
                    var device = HdlDeviceCommonLogic.Current.GetDevice(bindObj.BindMacAddr, bindObj.BindEpoint);
                    var device = LocalDevice.Current.GetDevice(bindObj.BindMacAddr, bindObj.BindEpoint);
                    switch (curBindType)
                    {
                        case 1:
@@ -483,7 +483,7 @@
                    if (device != null)
                    {
                        //设备名字
                        btnBindNameText = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
                        btnBindNameText = Common.LocalDevice.Current.GetDeviceEpointName(device);

                        //获取设备所属房间
                        var tempDevRoom = HdlRoomLogic.Current.GetRoomByDevice(device);
@@ -571,7 +571,7 @@
            localDeviceList.Clear();
            scList.Clear();
            //设备
            foreach (var dev in HdlDeviceCommonLogic.Current.listAllDevice)
            foreach (var dev in Shared.Common.LocalDevice.Current.listAllDevice)
            {
                localDeviceList.Add(dev);
            }
@@ -715,7 +715,7 @@
                switch (curBindType)
                {
                    case 3:
                        var device = HdlDeviceCommonLogic.Current.GetDevice(bindDevice.BindMacAddr, bindDevice.BindEpoint);
                        var device = LocalDevice.Current.GetDevice(bindDevice.BindMacAddr, bindDevice.BindEpoint);
                        if (device != null)
                        {
                            if (device.Type == DeviceType.DimmableLight)