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/MostRightIconControl.cs |   66 ++++++++++++++++----------------
 1 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MostRightIconControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MostRightIconControl.cs
index 673e824..0d777ab 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MostRightIconControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MostRightIconControl.cs
@@ -4,18 +4,18 @@
 
 namespace Shared.Phone.UserCenter
 {
-    /// <summary>
-    /// 鍋氭垚鏀惧湪鐢婚潰鍙宠竟鐨勭殑鍥炬爣鎺т欢(娉ㄦ剰,瀹冧笉鑳界敤鏉ュ仛銆愬悜鍙炽�戠殑鍥炬爣)
-    /// </summary>
-    public class MostRightIconControl : FrameLayoutControl
-    {
+    /// <summary>
+    /// 鍋氭垚鏀惧湪鐢婚潰鍙宠竟鐨勭殑鍥炬爣鎺т欢(娉ㄦ剰,瀹冧笉鑳界敤鏉ュ仛銆愬悜鍙炽�戠殑鍥炬爣)
+    /// </summary>
+    public class MostRightIconControl : FrameLayoutStatuControl
+    {
         /// <summary>
         /// 鍥炬爣鎺т欢(杩笉寰楀繁锛岃繖涓笢瑗垮紑鏀惧嚭鍘�)
-        /// </summary>
-        public IconControlCommon btnIcon = null;
+        /// </summary>
+        public IconControlCommon btnIcon = null;
         /// <summary>
         /// UnSelectedImagePath
-        /// </summary>
+        /// </summary>
         public string UnSelectedImagePath
         {
             get { return btnIcon.UnSelectedImagePath; }
@@ -23,7 +23,7 @@
         }
         /// <summary>
         /// SelectedImagePath
-        /// </summary>
+        /// </summary>
         public string SelectedImagePath
         {
             get { return btnIcon.SelectedImagePath; }
@@ -31,49 +31,49 @@
         }
         /// <summary>
         /// IsSelected
-        /// </summary>
+        /// </summary>
         public bool IsSelected
         {
             get { return btnIcon.IsSelected; }
             set { btnIcon.IsSelected = value; }
-        }
-
+        }
+
         /// <summary>
         /// X杞寸殑鐪熷疄鍋忕Щ閲�(璇风‘淇濆凡缁忚皟鐢↖nitControl鍒濆鍖栧嚱鏁�,鐢ㄦ硶:钃濇箹涓婄殑X杞�,鍑忔帀杩欎釜鍊煎嵆鍙�)
-        /// </summary>
+        /// </summary>
         public int XOffset
         {
             get { return (this.Width - btnIcon.Width) / 2; }
-        }
-
+        }
+
         /// <summary>
         /// 鍋氭垚鏀惧湪鐢婚潰鍙宠竟鐨勭殑鍥炬爣鎺т欢(娉ㄦ剰,瀹冧笉鑳界敤鏉ュ仛銆愬悜鍙炽�戠殑鍥炬爣)
         /// </summary>
-        /// <param name="i_width">鎺т欢绌哄害</param>
-        /// <param name="i_height">鎺т欢楂樺害</param>
-        public MostRightIconControl(int i_width, int i_height)
-        {
-            this.UseClickStatu = false;
-
-            this.Width = Application.GetMinRealAverage(110);
-            this.Height = this.Parent != null ? this.Parent.Height : ControlCommonResourse.ListViewRowHeight;
-            this.Gravity = Gravity.CenterVertical;
-
-            var XX = Application.CurrentWidth - Application.GetMinRealAverage(i_width) - ControlCommonResourse.XXLeft;
-            this.X = XX - Application.GetMinRealAverage((110 - i_width) / 2);
+        /// <param name="i_width">鎺т欢绌哄害</param>
+        /// <param name="i_height">鎺т欢楂樺害</param>
+        public MostRightIconControl(int i_width, int i_height)
+        {
+            this.UseClickStatu = false;
+
+            this.Width = this.GetPictrueRealSize(110);
+            this.Height = this.Parent != null ? this.Parent.Height : ControlCommonResourse.ListViewRowHeight;
+            this.Gravity = Gravity.CenterVertical;
+
+            var XX = Application.CurrentWidth - this.GetPictrueRealSize(i_width) - ControlCommonResourse.XXLeft;
+            this.X = XX - this.GetPictrueRealSize((110 - i_width) / 2);
 
             this.btnIcon = new IconControlCommon();
-            btnIcon.Width = Application.GetMinRealAverage(i_width);
-            btnIcon.Height = Application.GetMinRealAverage(i_height);
+            btnIcon.Width = this.GetPictrueRealSize(i_width);
+            btnIcon.Height = this.GetPictrueRealSize(i_height);
             btnIcon.Gravity = Gravity.Center;
-        }
-
+        }
+
         /// <summary>
         /// 鍒濆鍖�
-        /// </summary>
+        /// </summary>
         public void InitControl()
         {
             this.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
-        }
+        }
     }
 }

--
Gitblit v1.8.0