From 23fb45dd846ed8b62304c408c6bbe64265d4ac8b Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 20 十二月 2019 18:57:16 +0800
Subject: [PATCH] 代码合并
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/NormalSelectControl.cs | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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..dbc3daa 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/NormalSelectControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/NormalSelectControl.cs
@@ -45,6 +45,10 @@
}
}
}
+ /// <summary>
+ /// 澶勪簬闈為�変腑鐘舵�佹椂锛屾槸鍚︽妸瀛椾綋鍙樻垚鐏拌壊(榛樿鍙樻垚鐏拌壊)
+ /// </summary>
+ public bool ChangedTextColor = true;
#endregion
@@ -63,8 +67,15 @@
/// <summary>
/// 鍒濆鍖栧唴閮ㄦ帶浠�
/// </summary>
- public void InitControl()
+ /// <param name="iconParh">宸︿晶鍥炬爣</param>
+ public void InitControl(string iconParh = "")
{
+ //鍥剧墖
+ if (iconParh != "")
+ {
+ var btnIcon = this.AddLeftIcon();
+ btnIcon.UnSelectedImagePath = iconParh;
+ }
//鏄剧ず鏂囨湰
btnText = this.AddLeftCaption(this.textValue, 600);
btnText.TextColor = UserCenterColor.Current.TextGrayColor3;
@@ -88,7 +99,10 @@
return;
}
btnSelect.Visible = true;
- btnText.TextColor = UserCenterColor.Current.TextColor1;
+ if (this.ChangedTextColor == true)
+ {
+ btnText.TextColor = UserCenterColor.Current.TextColor1;
+ }
//鐘舵�佸彉鏇�
Statu = StatuMode.SELECT;
}
@@ -103,7 +117,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