From 9ef48d7b2da7c408b53f73be0f6eef3cbac1c84a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 19 十一月 2020 10:23:45 +0800
Subject: [PATCH] Evoyo.Home1.1.0120111601_Release
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
index 9fff52d..86cc665 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
@@ -42,7 +42,7 @@
/// <summary>
/// 鍋氭垚涓�涓猂owLayout鍨嬬殑FrameLayout
/// </summary>
- /// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(鐪熷疄鍊�,鏈変簺鐣岄潰闇�瑕佽繖绉嶇壒娈婃搷浣�)</param>
+ /// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(銆愬垪琛ㄦ帶浠剁殑rowSpace/2銆戝嵆鍙�,涓嶆噦榛樿涓�0鍗冲彲)</param>
public FrameRowControl(int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)
{
this.Height = ControlCommonResourse.ListViewRowHeight;
@@ -98,7 +98,7 @@
i_width = Application.GetRealWidth(i_width);
}
var contr = this.AddLeftCaption(i_caption, i_width, this.Height, false);
- this.AddChidren(contr, ChidrenBindMode.BindEventOnly);
+ this.AddChidren(contr, ChidrenBindMode.BindEvent);
if (chidrenYaxis != 0)
{
contr.Y += chidrenYaxis;
@@ -173,13 +173,18 @@
/// 娣诲姞宸﹁竟鍥炬爣
/// </summary>
/// <param name="i_Iconsize">鍥炬爣澶у皬</param>
+ /// <param name="i_IconPath">鍥炬爣鍦板潃</param>
/// <returns></returns>
- public IconViewControl AddLeftIcon(int i_Iconsize = 81)
+ public IconViewControl AddLeftIcon(int i_Iconsize = 81, string i_IconPath = null)
{
var btnIcon = new IconViewControl(i_Iconsize);
btnIcon.X = ControlCommonResourse.XXLeft + LeftOffset;
btnIcon.Gravity = Gravity.CenterVertical;
- this.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
+ if (i_IconPath != null)
+ {
+ btnIcon.UnSelectedImagePath = i_IconPath;
+ }
+ this.AddChidren(btnIcon, ChidrenBindMode.BindEvent);
if (chidrenYaxis != 0)
{
btnIcon.Y += chidrenYaxis;
@@ -202,7 +207,7 @@
btnRight.Gravity = Gravity.CenterVertical;
btnRight.X =this.Width - btnRight.IconSize - ControlCommonResourse.XXLeft + RightOffset;
btnRight.UnSelectedImagePath = "Item/RightNext.png";
- this.AddChidren(btnRight, ChidrenBindMode.BindEventOnly);
+ this.AddChidren(btnRight, ChidrenBindMode.BindEvent);
if (chidrenYaxis != 0)
{
@@ -227,7 +232,7 @@
this.AddChidren(btnContr, ChidrenBindMode.NotBind);
btnContr.InitControl();
//澶嶅悎鎺т欢闇�瑕佺壒娈婂鐞�
- this.ChangedChidrenBindMode(btnContr, ChidrenBindMode.BindEventOnly);
+ this.ChangedChidrenBindMode(btnContr, ChidrenBindMode.BindEvent);
if (RightOffset != 0)
{
btnContr.X += RightOffset;
@@ -278,7 +283,7 @@
i_width = Application.GetRealWidth(i_width);
}
var btnContr = AddMostRightView(i_text, i_width, this.Height, false);
- this.AddChidren(btnContr, ChidrenBindMode.BindEventOnly);
+ this.AddChidren(btnContr, ChidrenBindMode.BindEvent);
if (chidrenYaxis != 0)
{
btnContr.Y += chidrenYaxis;
@@ -331,8 +336,9 @@
}
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);
+ //褰撴寚瀹氬疄闄呭潗鏍囨椂,杩欓噷闇�瑕佺殑鍋忕Щ閲忎负2鍊�
+ contr.Y = Application.GetRealHeight(12) + this.chidrenYaxis * 2;
+ this.AddChidren(contr, ChidrenBindMode.BindEvent);
return contr;
}
@@ -355,10 +361,11 @@
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;
+ //褰撴寚瀹氬疄闄呭潗鏍囨椂,杩欓噷闇�瑕佺殑鍋忕Щ閲忎负2鍊�
+ contr.Y = Application.GetRealHeight(72) + this.chidrenYaxis * 2;
contr.TextSize = 12;
contr.TextColor = UserCenterColor.Current.TextGrayColor1;
- this.AddChidren(contr, ChidrenBindMode.BindEventOnly);
+ this.AddChidren(contr, ChidrenBindMode.BindEvent);
return contr;
}
--
Gitblit v1.8.0