From d6fb0646531172f23648441c224cdcccd721b894 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 14 十二月 2020 09:59:01 +0800
Subject: [PATCH] 请合并代码，完成晾衣架最终功能。
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/NormalSelectControl.cs | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/NormalSelectControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/NormalSelectControl.cs
index dbc3daa..850ab6d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/NormalSelectControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/NormalSelectControl.cs
@@ -16,6 +16,10 @@
/// </summary>
private string textValue = string.Empty;
/// <summary>
+ /// 涓嬮儴鏄剧ず鏂囨湰
+ /// </summary>
+ private string textBottomValue = null;
+ /// <summary>
/// 鏂囨湰鎺т欢
/// </summary>
private NormalViewControl btnText = null;
@@ -46,7 +50,7 @@
}
}
/// <summary>
- /// 澶勪簬闈為�変腑鐘舵�佹椂锛屾槸鍚︽妸瀛椾綋鍙樻垚鐏拌壊(榛樿鍙樻垚鐏拌壊)
+ /// 澶勪簬閫変腑鎴栬�呴潪閫変腑鐘舵�佹椂锛屾槸鍚﹀彉鏇村瓧浣撻鑹�
/// </summary>
public bool ChangedTextColor = true;
@@ -58,10 +62,22 @@
/// 鍋氭垚涓�涓畝鍗曠殑閫夋嫨鎺т欢
/// </summary>
/// <param name="i_text">鏄剧ず鏂囨湰</param>
- /// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(鐪熷疄鍊�,鏈変簺鐣岄潰闇�瑕佽繖绉嶇壒娈婃搷浣�)</param>
+ /// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(銆愬垪琛ㄦ帶浠剁殑rowSpace/2銆戝嵆鍙�,涓嶆噦榛樿涓�0鍗冲彲)</param>
public NormalSelectControl(string i_text, int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)
{
this.textValue = i_text;
+ }
+
+ /// <summary>
+ /// 鍋氭垚涓�涓畝鍗曠殑閫夋嫨鎺т欢
+ /// </summary>
+ /// <param name="i_topText">涓婇儴鏄剧ず鏂囨湰</param>
+ /// <param name="i_bottomText">涓嬮儴鏄剧ず鏂囨湰</param>
+ /// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(銆愬垪琛ㄦ帶浠剁殑rowSpace/2銆戝嵆鍙�,涓嶆噦榛樿涓�0鍗冲彲)</param>
+ public NormalSelectControl(string i_topText, string i_bottomText, int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)
+ {
+ this.textValue = i_topText;
+ this.textBottomValue = i_bottomText;
}
/// <summary>
@@ -76,9 +92,18 @@
var btnIcon = this.AddLeftIcon();
btnIcon.UnSelectedImagePath = iconParh;
}
- //鏄剧ず鏂囨湰
- btnText = this.AddLeftCaption(this.textValue, 600);
- btnText.TextColor = UserCenterColor.Current.TextGrayColor3;
+ if (this.textBottomValue == null)
+ {
+ //鏄剧ず鏂囨湰
+ btnText = this.AddLeftCaption(this.textValue, 600);
+ btnText.TextColor = UserCenterColor.Current.TextGrayColor3;
+ }
+ else
+ {
+ //鏄剧ず鏂囨湰
+ btnText = this.AddTopView(this.textValue, 600);
+ this.AddBottomView(this.textBottomValue, 600);
+ }
//閫夋嫨鎺т欢
btnSelect = this.AddMostRightEmptyIcon(58, 58);
btnSelect.Visible = false;
--
Gitblit v1.8.0