From e22fdb94322e6cec38e5e4a9aec13d431a133fde Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 28 四月 2020 16:32:35 +0800
Subject: [PATCH] 上传合并后的代码

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/IconViewControl.cs |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/IconViewControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/IconViewControl.cs
index 6068952..eb6a9cc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/IconViewControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/IconViewControl.cs
@@ -1,16 +1,16 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Shared.Phone.UserCenter
-{
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shared.Phone.UserCenter
+{
     /// <summary>
     /// 鍋氭垚涓�涓樉绀哄浘鏍囩殑鎺т欢(闇�瑕佹墜鍔ㄥ紑鍚偣鍑荤姸鎬�)
     /// </summary>
     public class IconViewControl : IconControlCommon
     {
-        /// <summary>
-        /// 鍥炬爣澶у皬
+        /// <summary>
+        /// 鍥炬爣澶у皬
         /// </summary>
         public int IconSize = 0;
         /// <summary>
@@ -22,10 +22,10 @@
         {
             this.InitIconSize(size, size, real);
             this.IconSize = size;
-            if (real == true)
-            {
-                this.IconSize = Application.GetMinRealAverage(size);
+            if (real == true)
+            {
+                this.IconSize = this.GetPictrueRealSize(size);
             }
         }
-    }
-}
+    }
+}

--
Gitblit v1.8.0