2020-03-17-1

WJC

2020-03-17 f6e34a69f1d1e0b0b3a6252fe20acddca7fe56e5

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

@@ -38,7 +38,7 @@
            this.Height = Application.GetMinRealAverage(207);

            this.Width = Application.GetMinRealAverage(207);

            this.BackgroundColor = UserCenterColor.Current.White;

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

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

        }



        /// <summary>

@@ -51,14 +51,20 @@
            //第二层底色

            var btnIcon2 = new NormalViewControl(Application.GetMinRealAverage(184), Application.GetMinRealAverage(184), false);

            btnIcon2.BackgroundColor = 0xfffef1ed;

            btnIcon2.Radius = (uint)Application.GetMinRealAverage(184);

            btnIcon2.Radius = (uint)Application.GetMinRealAverage(184) / 2;

            btnIcon2.Gravity = Gravity.Center;

            this.AddChidren(btnIcon2);



            //设备图标

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

            if (listDevice.Count == 0)

            {

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

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

            }

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

            btnIcon.Gravity = Gravity.Center;

            Common.LocalDevice.Current.SetDeviceBeloneIconToControl(btnIcon, Common.LocalDevice.Current.GetDevicesByMac(deviceMac));

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

            this.AddChidren(btnIcon);

        }



@@ -72,7 +78,7 @@
            //第二层底色

            var btnIcon2 = new NormalViewControl(Application.GetMinRealAverage(184), Application.GetMinRealAverage(184), false);

            btnIcon2.BackgroundColor = 0xfffef1ed;

            btnIcon2.Radius = (uint)Application.GetMinRealAverage(184);

            btnIcon2.Radius = (uint)Application.GetMinRealAverage(184) / 2;

            btnIcon2.Gravity = Gravity.Center;

            this.AddChidren(btnIcon2);



@@ -95,7 +101,13 @@
            if (this.deviceMac != null)

            {

                //刷新图标

                Common.LocalDevice.Current.SetDeviceBeloneIconToControl(btnIcon, Common.LocalDevice.Current.GetDevicesByMac(deviceMac));

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

                if (listDevice.Count == 0)

                {

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

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

                }

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

            }

            else

            {