From ec34983e291d1c85284472a27109d55891f9a6b5 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 07 八月 2020 16:20:16 +0800
Subject: [PATCH] 不是新代码，别 合并
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/NormalSelectControl.cs | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/NormalSelectControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/NormalSelectControl.cs
index ed3b31f..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;
@@ -45,6 +49,10 @@
}
}
}
+ /// <summary>
+ /// 澶勪簬閫変腑鎴栬�呴潪閫変腑鐘舵�佹椂锛屾槸鍚﹀彉鏇村瓧浣撻鑹�
+ /// </summary>
+ public bool ChangedTextColor = true;
#endregion
@@ -54,20 +62,48 @@
/// 鍋氭垚涓�涓畝鍗曠殑閫夋嫨鎺т欢
/// </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>
/// 鍒濆鍖栧唴閮ㄦ帶浠�
/// </summary>
- public void InitControl()
+ /// <param name="iconParh">宸︿晶鍥炬爣</param>
+ public void InitControl(string iconParh = "")
{
- //鏄剧ず鏂囨湰
- btnText = this.AddLeftCaption(this.textValue, 600);
- btnText.TextColor = UserCenterColor.Current.TextGrayColor3;
+ //鍥剧墖
+ if (iconParh != "")
+ {
+ var btnIcon = this.AddLeftIcon();
+ btnIcon.UnSelectedImagePath = iconParh;
+ }
+ 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;
@@ -88,7 +124,10 @@
return;
}
btnSelect.Visible = true;
- btnText.TextColor = UserCenterColor.Current.TextColor1;
+ if (this.ChangedTextColor == true)
+ {
+ btnText.TextColor = UserCenterColor.Current.TextColor1;
+ }
//鐘舵�佸彉鏇�
Statu = StatuMode.SELECT;
}
@@ -103,7 +142,10 @@
return;
}
btnSelect.Visible = false;
- btnText.TextColor = UserCenterColor.Current.TextGrayColor3;
+ if (this.ChangedTextColor == true)
+ {
+ btnText.TextColor = UserCenterColor.Current.TextGrayColor3;
+ }
//鐘舵�佸彉鏇�
Statu = StatuMode.UN_SELECT;
}
--
Gitblit v1.8.0