From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

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

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
index 1f8b11b..fc04e27 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
@@ -192,7 +192,7 @@
             var btnRight = new IconViewControl(58);
             btnRight.Gravity = Gravity.CenterVertical;
             btnRight.X =this.Width - btnRight.IconSize - ControlCommonResourse.XXLeft + RightOffset;
-            btnRight.UnSelectedImagePath = "Item/Next.png";
+            btnRight.UnSelectedImagePath = "Item/RightNext.png";
             this.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);
 
             if (chidrenYaxis != 0)
@@ -304,5 +304,56 @@
         }
 
         #endregion
+
+        #region 鈻� 娣诲姞涓婇儴鐨勬樉绀烘枃鏈琠________________
+
+        /// <summary>
+        /// 娣诲姞涓婇儴鐨勬樉绀烘枃鏈�(濡傛灉鏈夊浘鏍囷紝鍒欏厛娣诲姞鍥炬爣锛屽啀娣诲姞鏂囨湰)
+        /// </summary>
+        /// <param name="i_caption">鍐呭</param>
+        /// <param name="i_width">瀹藉害</param>
+        /// <param name="real">鏄惁璁$畻鐪熷疄鍊�</param>
+        /// <returns></returns>
+        public NormalViewControl AddTopView(string i_caption, int i_width, bool real = true)
+        {
+            if (real == true)
+            {
+                i_width = Application.GetRealWidth(i_width);
+            }
+            var contr = this.AddLeftCaption(i_caption, i_width, Application.GetRealHeight(60), false);
+            contr.TextSize = 15;
+            contr.Y = Application.GetRealHeight(12) + this.chidrenYaxis;
+            this.AddChidren(contr, ChidrenBindMode.BindEventOnly);
+
+            return contr;
+        }
+
+        #endregion
+
+        #region 鈻� 娣诲姞涓嬮儴鐨勬樉绀烘枃鏈琠________________
+
+        /// <summary>
+        /// 娣诲姞涓嬮儴鐨勬樉绀烘枃鏈�(濡傛灉鏈夊浘鏍囷紝鍒欏厛娣诲姞鍥炬爣锛屽啀娣诲姞鏂囨湰)
+        /// </summary>
+        /// <param name="i_caption">鍐呭</param>
+        /// <param name="i_width">瀹藉害</param>
+        /// <param name="real">鏄惁璁$畻鐪熷疄鍊�</param>
+        /// <returns></returns>
+        public NormalViewControl AddBottomView(string i_caption, int i_width, bool real = true)
+        {
+            if (real == true)
+            {
+                i_width = Application.GetRealWidth(i_width);
+            }
+            var contr = this.AddLeftCaption(i_caption, i_width, Application.GetRealHeight(50), false);
+            contr.Y = Application.GetRealHeight(72) + this.chidrenYaxis;
+            contr.TextSize = 12;
+            contr.TextColor = UserCenterColor.Current.TextGrayColor1;
+            this.AddChidren(contr, ChidrenBindMode.BindEventOnly);
+
+            return contr;
+        }
+
+        #endregion
     }
 }

--
Gitblit v1.8.0