新云端的代码Ver1.0

黄学彪

2020-11-20 99253403b560f761d5f9af8b4f5140496996433a

 ZigbeeApp/Shared/Phone/Common/Controls/DeviceControls/DeviceInfoIconControl.cs

old mode 100755
new mode 100644
File was renamed from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceInfoIconControl.cs
@@ -3,7 +3,7 @@
using System.Text;

using ZigBee.Device;



namespace Shared.Phone.UserCenter

namespace Shared.Phone
{

    /// <summary>

    /// 设备信息界面的设备图标控件(兼容网关)

@@ -63,15 +63,15 @@
            this.AddChidren(btnIcon2, ChidrenBindMode.BindEvent);



            //设备图标

            var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);

            var listDevice = HdlDeviceCommonLogic.Current.GetDevicesByMac(deviceMac);
            if (listDevice.Count == 0)

            {

                //对应单纯只有200回路的设备

                listDevice.Add(Common.LocalDevice.Current.GetOTADevice(deviceMac));

                listDevice.Add(HdlDeviceCommonLogic.Current.GetOTADevice(deviceMac));
            }

            btnIcon = new NormalViewControl(this.GetPictrueRealSize(121), this.GetPictrueRealSize(121), false);

            btnIcon.Gravity = Gravity.Center;

            Common.LocalDevice.Current.SetDeviceObjectIconToControl(btnIcon, listDevice);

            HdlDeviceCommonLogic.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;

            Common.LocalDevice.Current.SetDeviceIconToControl(btnIcon, Common.LocalDevice.Current.GetDevice(deviceMacAddr, epoint));

            HdlDeviceCommonLogic.Current.SetDeviceIconToControl(btnIcon, HdlDeviceCommonLogic.Current.GetDevice(deviceMacAddr, epoint));
            this.AddChidren(btnIcon, ChidrenBindMode.BindEvent);

        }



@@ -134,18 +134,18 @@
            if (this.deviceEpoint != -1)

            {

                //刷新图标

                Common.LocalDevice.Current.SetDeviceIconToControl(btnIcon, Common.LocalDevice.Current.GetDevice(this.deviceMac, this.deviceEpoint));

                HdlDeviceCommonLogic.Current.SetDeviceIconToControl(btnIcon, HdlDeviceCommonLogic.Current.GetDevice(this.deviceMac, this.deviceEpoint));
            }

            else if (this.deviceMac != null)

            {

                //刷新图标

                var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);

                var listDevice = HdlDeviceCommonLogic.Current.GetDevicesByMac(deviceMac);
                if (listDevice.Count == 0)

                {

                    //对应单纯只有200回路的设备

                    listDevice.Add(Common.LocalDevice.Current.GetOTADevice(deviceMac));

                    listDevice.Add(HdlDeviceCommonLogic.Current.GetOTADevice(deviceMac));
                }

                Common.LocalDevice.Current.SetDeviceObjectIconToControl(btnIcon, listDevice);

                HdlDeviceCommonLogic.Current.SetDeviceObjectIconToControl(btnIcon, listDevice);
            }

            else

            {