From c1de48884fa145a16a0f8bcee93274dcfaa0ff82 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 07 五月 2020 10:40:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs | 69 ++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 21 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
index 6427e96..098ffaa 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
@@ -17,7 +17,7 @@
private bool m_CanClick = true;
/// <summary>
/// 璁剧疆鑳藉惁瑙︾偣鍑讳簨浠�
- /// </summary>
+ /// </summary>
public bool CanClick
{
get { return m_CanClick; }
@@ -58,6 +58,23 @@
#endregion
+ #region 鈻� 閲嶅啓褰摜鐨勫睘鎬____________________
+
+ /// <summary>
+ /// 閲嶅啓Text灞炴��
+ /// </summary>
+ public new string Text
+ {
+ //鍏堣繖涔堝紕鍏堝惂
+ get { return base.Text == null ? string.Empty : base.Text; }
+ set
+ {
+ base.Text = value == null ? string.Empty : value;
+ }
+ }
+
+ #endregion
+
#region 鈻� 鍒濆鍖朹____________________________
/// <summary>
@@ -82,8 +99,8 @@
/// <summary>
/// 鍒濆鍖栨帶浠跺ぇ灏�(涓嶄互骞冲潎鍊艰繘琛岀湡瀹炴暟鍊艰绠�)
/// </summary>
- /// <param name="i_Width">瀹藉害</param>
- /// <param name="i_Height">楂樺害</param>
+ /// <param name="i_Width">瀹藉害</param>
+ /// <param name="i_Height">楂樺害</param>
/// <param name="real">鏄惁璁＄畻鐪熷疄鍊�</param>
public void InitSize(int i_Width, int i_Height, bool real = true)
{
@@ -91,50 +108,50 @@
{
i_Width = Application.GetRealWidth(i_Width);
i_Height = Application.GetRealHeight(i_Height);
- }
- this.Height = i_Height;
+ }
+ this.Height = i_Height;
this.Width = i_Width;
}
/// <summary>
/// 鍒濆鍖栨帶浠跺ぇ灏�(涓嶄互骞冲潎鍊艰繘琛岀湡瀹炴暟鍊艰绠�)
/// </summary>
- /// <param name="i_Width">瀹藉害</param>
+ /// <param name="i_Width">瀹藉害</param>
/// <param name="real">鏄惁璁＄畻鐪熷疄鍊�</param>
public void InitSize(int i_Width, bool real = false)
{
if (real == true)
{
i_Width = Application.GetRealWidth(i_Width);
- }
-
- this.Height = ControlCommonResourse.NormalControlHeight;
+ }
+
+ this.Height = ControlCommonResourse.NormalControlHeight;
this.Width = i_Width;
}
/// <summary>
/// 鍒濆鍖栧浘鏍囨帶浠跺ぇ灏�(浠ュ钩鍧囧�艰繘琛岀湡瀹炴暟鍊艰绠�)
/// </summary>
- /// <param name="i_Width">瀹藉害</param>
- /// <param name="i_Height">楂樺害</param>
+ /// <param name="i_Width">瀹藉害</param>
+ /// <param name="i_Height">楂樺害</param>
/// <param name="real">鏄惁璁＄畻鐪熷疄鍊�</param>
public void InitIconSize(int i_Width, int i_Height, bool real = true)
{
if (real == true)
{
- i_Width = Application.GetMinRealAverage(i_Width);
- i_Height = Application.GetMinRealAverage(i_Height);
- }
-
- this.Height = i_Height;
+ i_Width = this.GetPictrueRealSize(i_Width);
+ i_Height = this.GetPictrueRealSize(i_Height);
+ }
+
+ this.Height = i_Height;
this.Width = i_Width;
}
/// <summary>
/// 鍒濆鍖栧浘鐗囨帶浠跺ぇ灏�
/// </summary>
- /// <param name="i_Width">瀹藉害</param>
- /// <param name="i_Height">楂樺害</param>
+ /// <param name="i_Width">瀹藉害</param>
+ /// <param name="i_Height">楂樺害</param>
/// <param name="real">鏄惁璁＄畻鐪熷疄鍊�</param>
public void InitPictrueSize(int i_Width, int i_Height, bool real = true)
{
@@ -142,9 +159,9 @@
{
i_Width = HdlControlLogic.Current.GetPictrueRealSize(i_Width);
i_Height = HdlControlLogic.Current.GetPictrueRealSize(i_Height);
- }
-
- this.Height = i_Height;
+ }
+
+ this.Height = i_Height;
this.Width = i_Width;
}
@@ -319,6 +336,16 @@
#endif
}
+ /// <summary>
+ /// 璁＄畻鍥剧墖鐨勭湡瀹為珮瀹藉害
+ /// </summary>
+ /// <param name="i_size"></param>
+ /// <returns></returns>
+ public int GetPictrueRealSize(int i_size)
+ {
+ return HdlControlLogic.Current.GetPictrueRealSize(i_size);
+ }
+
#endregion
#region 鈻� Log鍑哄姏____________________________
--
Gitblit v1.8.0