From 9c16d3614d9b88c637f967518a329f239fcd3aaf Mon Sep 17 00:00:00 2001
From: lss <316519258@qq.com>
Date: 星期五, 12 六月 2020 09:22:04 +0800
Subject: [PATCH] 2020.06.12

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceInfoIconControl.cs |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceInfoIconControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceInfoIconControl.cs
index 7da740e..863d55a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceInfoIconControl.cs
+++ b/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,13 +54,13 @@
         {
             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;
             btnIcon2.Radius = (uint)iconWidth / 2;
             btnIcon2.Gravity = Gravity.Center;
-            this.AddChidren(btnIcon2, ChidrenBindMode.BindEventOnly);
+            this.AddChidren(btnIcon2, ChidrenBindMode.BindEvent);
 
             //璁惧鍥炬爣
             var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
@@ -69,10 +69,10 @@
                 //瀵瑰簲鍗曠函鍙湁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);
+            this.AddChidren(btnIcon, ChidrenBindMode.BindEvent);
         }
 
         /// <summary>
@@ -84,19 +84,19 @@
             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;
             btnIcon2.Radius = (uint)iconWidth / 2;
             btnIcon2.Gravity = Gravity.Center;
-            this.AddChidren(btnIcon2, ChidrenBindMode.BindEventOnly);
+            this.AddChidren(btnIcon2, ChidrenBindMode.BindEvent);
 
             //璁惧鍥炬爣
-            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);
+            this.AddChidren(btnIcon, ChidrenBindMode.BindEvent);
         }
 
         /// <summary>
@@ -107,19 +107,19 @@
         {
             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;
             btnIcon2.Radius = (uint)iconWidth / 2;
             btnIcon2.Gravity = Gravity.Center;
-            this.AddChidren(btnIcon2, ChidrenBindMode.BindEventOnly);
+            this.AddChidren(btnIcon2, ChidrenBindMode.BindEvent);
 
             //璁惧鍥炬爣
-            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);
+            this.AddChidren(btnIcon, ChidrenBindMode.BindEvent);
         }
 
         #endregion

--
Gitblit v1.8.0