合并代码 ver.10086

黄学彪

2020-01-17 4b378188ce972df432b23d9cb73babb6cc0679c6

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

@@ -56,9 +56,15 @@
            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.SetDeviceObjectIconToControl(btnIcon, Common.LocalDevice.Current.GetDevicesByMac(deviceMac));

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

            this.AddChidren(btnIcon);

        }



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

            {

                //刷新图标

                Common.LocalDevice.Current.SetDeviceObjectIconToControl(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

            {