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

黄学彪

2020-12-14 e90209beae6a4e822cecb18e6889f8bda23f630e

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceInfoIconControl.cs

File was renamed from ZigbeeApp/Shared/Phone/Common/Controls/DeviceControls/DeviceInfoIconControl.cs
@@ -3,7 +3,7 @@
using System.Text;
using ZigBee.Device;

namespace Shared.Phone
namespace Shared.Phone.UserCenter
{
    /// <summary>
    /// 设备信息界面的设备图标控件(兼容网关)
@@ -63,15 +63,15 @@
            this.AddChidren(btnIcon2, ChidrenBindMode.BindEvent);

            //设备图标
            var listDevice = HdlDeviceCommonLogic.Current.GetDevicesByMac(deviceMac);
            var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
            if (listDevice.Count == 0)
            {
                //对应单纯只有200回路的设备
                listDevice.Add(HdlDeviceCommonLogic.Current.GetOTADevice(deviceMac));
                listDevice.Add(Common.LocalDevice.Current.GetOTADevice(deviceMac));
            }
            btnIcon = new NormalViewControl(this.GetPictrueRealSize(121), this.GetPictrueRealSize(121), false);
            btnIcon.Gravity = Gravity.Center;
            HdlDeviceCommonLogic.Current.SetDeviceObjectIconToControl(btnIcon, listDevice);
            Common.LocalDevice.Current.SetDeviceObjectIconToControl(btnIcon, listDevice);
            this.AddChidren(btnIcon, ChidrenBindMode.BindEvent);
        }

@@ -95,7 +95,7 @@
            //设备图标
            btnIcon = new NormalViewControl(this.GetPictrueRealSize(121), this.GetPictrueRealSize(121), false);
            btnIcon.Gravity = Gravity.Center;
            HdlDeviceCommonLogic.Current.SetDeviceIconToControl(btnIcon, HdlDeviceCommonLogic.Current.GetDevice(deviceMacAddr, epoint));
            Common.LocalDevice.Current.SetDeviceIconToControl(btnIcon, Common.LocalDevice.Current.GetDevice(deviceMacAddr, epoint));
            this.AddChidren(btnIcon, ChidrenBindMode.BindEvent);
        }

@@ -134,18 +134,18 @@
            if (this.deviceEpoint != -1)
            {
                //刷新图标
                HdlDeviceCommonLogic.Current.SetDeviceIconToControl(btnIcon, HdlDeviceCommonLogic.Current.GetDevice(this.deviceMac, this.deviceEpoint));
                Common.LocalDevice.Current.SetDeviceIconToControl(btnIcon, Common.LocalDevice.Current.GetDevice(this.deviceMac, this.deviceEpoint));
            }
            else if (this.deviceMac != null)
            {
                //刷新图标
                var listDevice = HdlDeviceCommonLogic.Current.GetDevicesByMac(deviceMac);
                var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
                if (listDevice.Count == 0)
                {
                    //对应单纯只有200回路的设备
                    listDevice.Add(HdlDeviceCommonLogic.Current.GetOTADevice(deviceMac));
                    listDevice.Add(Common.LocalDevice.Current.GetOTADevice(deviceMac));
                }
                HdlDeviceCommonLogic.Current.SetDeviceObjectIconToControl(btnIcon, listDevice);
                Common.LocalDevice.Current.SetDeviceObjectIconToControl(btnIcon, listDevice);
            }
            else
            {