上传合并后的代码

黄学彪

2020-04-28 e22fdb94322e6cec38e5e4a9aec13d431a133fde

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

@@ -8,7 +8,7 @@
    /// <summary>

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

    /// </summary>

    public class DeviceInfoIconControl : FrameLayoutControl

    public class DeviceInfoIconControl : FrameLayoutStatuControl

    {

        #region ■ 变量声明___________________________



@@ -39,10 +39,10 @@
        public DeviceInfoIconControl()

        {

            //第一层底色

            this.Height = Application.GetMinRealAverage(207);

            this.Width = Application.GetMinRealAverage(207);

            this.Height = this.GetPictrueRealSize(207);

            this.Width = this.GetPictrueRealSize(207);

            this.BackgroundColor = UserCenterColor.Current.White;

            this.Radius = (uint)Application.GetMinRealAverage(207) / 2;

            this.Radius = (uint)this.GetPictrueRealSize(207) / 2;

            this.UseClickStatu = false;

        }



@@ -54,7 +54,7 @@
        {

            this.deviceMac = i_device.DeviceAddr;

            //防止出现误差

            int iconWidth = Application.GetMinRealAverage(207) - Application.GetMinRealAverage(12) - Application.GetMinRealAverage(12);

            int iconWidth = this.GetPictrueRealSize(207) - this.GetPictrueRealSize(12) - this.GetPictrueRealSize(12);

            //第二层底色

            var btnIcon2 = new NormalViewControl(iconWidth, iconWidth, false);

            btnIcon2.BackgroundColor = 0xfffef1ed;

@@ -69,7 +69,7 @@
                //对应单纯只有200回路的设备

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

            }

            btnIcon = new NormalViewControl(Application.GetMinRealAverage(121), Application.GetMinRealAverage(121), false);

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

            btnIcon.Gravity = Gravity.Center;

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

            this.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);

@@ -84,7 +84,7 @@
            this.deviceMac = deviceMacAddr;

            this.deviceEpoint = epoint;

            //防止出现误差

            int iconWidth = Application.GetMinRealAverage(207) - Application.GetMinRealAverage(12) - Application.GetMinRealAverage(12);

            int iconWidth = this.GetPictrueRealSize(207) - this.GetPictrueRealSize(12) - this.GetPictrueRealSize(12);

            //第二层底色

            var btnIcon2 = new NormalViewControl(iconWidth, iconWidth, false);

            btnIcon2.BackgroundColor = 0xfffef1ed;

@@ -93,7 +93,7 @@
            this.AddChidren(btnIcon2, ChidrenBindMode.BindEventOnly);



            //设备图标

            btnIcon = new NormalViewControl(Application.GetMinRealAverage(121), Application.GetMinRealAverage(121), false);

            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));

            this.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);

@@ -107,7 +107,7 @@
        {

            this.zbGateway = i_gateway;

            //防止出现误差

            int iconWidth = Application.GetMinRealAverage(207) - Application.GetMinRealAverage(12) - Application.GetMinRealAverage(12);

            int iconWidth = this.GetPictrueRealSize(207) - this.GetPictrueRealSize(12) - this.GetPictrueRealSize(12);

            //第二层底色

            var btnIcon2 = new NormalViewControl(iconWidth, iconWidth, false);

            btnIcon2.BackgroundColor = 0xfffef1ed;

@@ -116,7 +116,7 @@
            this.AddChidren(btnIcon2, ChidrenBindMode.BindEventOnly);



            //设备图标

            btnIcon = new NormalViewControl(Application.GetMinRealAverage(121), Application.GetMinRealAverage(121), false);

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

            btnIcon.Gravity = Gravity.Center;

            HdlGatewayLogic.Current.SetGatewayIcon(btnIcon, i_gateway);

            this.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);