From f1c3921b08bb22ac6f5db22d620e01d7e8e5c49f Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 13:32:33 +0800
Subject: [PATCH] 2019-12-30-1

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs |   35 ++++++++++++++++++++++++++++-------
 1 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
index 167c1cc..1f8b11b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
@@ -214,6 +214,7 @@
         public MostRightIconControl AddMostRightEmptyIcon(int i_width, int i_height)
         {
             var btnContr = new MostRightIconControl(i_width, i_height);
+            btnContr.UseClickStatu = false;
             this.AddChidren(btnContr, ChidrenBindMode.NotBind);
             btnContr.InitControl();
             //澶嶅悎鎺т欢闇�瑕佺壒娈婂鐞�
@@ -226,7 +227,7 @@
             this.rightIconSize = Application.GetMinRealAverage(i_width);
             if (chidrenYaxis != 0)
             {
-                btnContr.Y += chidrenYaxis;
+                btnContr.btnIcon.Y += chidrenYaxis;
             }
 
             return btnContr;
@@ -267,12 +268,7 @@
             {
                 i_width = Application.GetRealWidth(i_width);
             }
-            var btnContr = new NormalViewControl(i_width, false);
-            btnContr.X = this.Width - ControlCommonResourse.XXLeft - i_width - rightIconSize + RightOffset;
-            btnContr.Height = this.Height;
-            btnContr.TextAlignment = TextAlignment.CenterRight;
-            btnContr.TextColor = UserCenterColor.Current.TextGrayColor1;
-            btnContr.Text = i_text;
+            var btnContr = AddMostRightView(i_text, i_width, this.Height, false);
             this.AddChidren(btnContr, ChidrenBindMode.BindEventOnly);
             if (chidrenYaxis != 0)
             {
@@ -282,6 +278,31 @@
             return btnContr;
         }
 
+        /// <summary>
+        /// 娣诲姞鏈�鍙崇殑鏄剧ず鏂囨湰,姝ゆ柟娉曚笉浼氫富鍔ㄦ坊鍔犲埌鐖舵帶浠朵腑(濡傛灉鍙宠竟鏈夊浘鏍囩殑璇�,鍏堟坊鍔犲浘鏍囧悗,鍐嶆坊鍔犺繖涓枃鏈�)
+        /// </summary>
+        /// <param name="i_caption">鍐呭</param>
+        /// <param name="i_width">瀹藉害</param>
+        /// <param name="i_height">楂樺害</param>
+        /// <param name="real">鏄惁璁$畻鐪熷疄鍊�</param>
+        /// <returns></returns>
+        public NormalViewControl AddMostRightView(string i_text, int i_width, int i_height, bool real = true)
+        {
+            if (real == true)
+            {
+                i_width = Application.GetRealWidth(i_width);
+                i_height = Application.GetRealHeight(i_height);
+            }
+            var btnContr = new NormalViewControl(i_width, i_height, false);
+            btnContr.X = this.Width - ControlCommonResourse.XXLeft - i_width - rightIconSize + RightOffset;
+            btnContr.Height = i_height;
+            btnContr.TextAlignment = TextAlignment.CenterRight;
+            btnContr.TextColor = UserCenterColor.Current.TextGrayColor1;
+            btnContr.Text = i_text;
+
+            return btnContr;
+        }
+
         #endregion
     }
 }

--
Gitblit v1.8.0