From e22fdb94322e6cec38e5e4a9aec13d431a133fde Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 28 四月 2020 16:32:35 +0800
Subject: [PATCH] 上传合并后的代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs | 62 +++++++++++++++---------------
1 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
index bb6104d..9fff52d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
@@ -1,18 +1,18 @@
-锘縰sing System;
-using System.Collections.Generic;
-
-namespace Shared.Phone.UserCenter
-{
- /// <summary>
- /// 鍋氭垚涓�涓猂owLayout鍨嬬殑FrameLayout
- /// </summary>
- public class FrameRowControl : FrameLayoutControl
+锘縰sing System;
+using System.Collections.Generic;
+
+namespace Shared.Phone.UserCenter
+{
+ /// <summary>
+ /// 鍋氭垚涓�涓猂owLayout鍨嬬殑FrameLayout
+ /// </summary>
+ public class FrameRowControl : FrameLayoutStatuControl
{
#region 鈻� 鍙橀噺澹版槑___________________________
/// <summary>
/// 姝ゆ帶浠剁殑璇嗗埆涓婚敭(鑷畾涔夎缃殑)
- /// </summary>
+ /// </summary>
public string MainKeys = string.Empty;
/// <summary>
/// 宸﹀亸绉婚噺,鍙拡瀵瑰唴缃帶浠舵湁鏁�(杩欐槸涓�涓湡瀹炲��,榛樿涓嶅亸绉汇�傛鏁颁负鍚戝彸鍋忕Щ,璐熸暟涓哄悜宸﹀亸绉�)
@@ -35,19 +35,19 @@
/// </summary>
private NormalViewControl btnBottomLine = null;
- #endregion
+ #endregion
#region 鈻� 鍒濆鍖朹____________________________
/// <summary>
/// 鍋氭垚涓�涓猂owLayout鍨嬬殑FrameLayout
- /// </summary>
- /// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(鐪熷疄鍊�,鏈変簺鐣岄潰闇�瑕佽繖绉嶇壒娈婃搷浣�)</param>
- public FrameRowControl(int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)
- {
+ /// </summary>
+ /// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(鐪熷疄鍊�,鏈変簺鐣岄潰闇�瑕佽繖绉嶇壒娈婃搷浣�)</param>
+ public FrameRowControl(int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)
+ {
this.Height = ControlCommonResourse.ListViewRowHeight;
- this.Width = Application.CurrentWidth;
- }
+ this.Width = Application.CurrentWidth;
+ }
#endregion
@@ -56,7 +56,7 @@
/// <summary>
/// <para>娣诲姞搴曠嚎(濡傛灉宸﹁竟鏈夊浘鏍囷紝鍒欏厛娣诲姞鍥炬爣锛屽啀娣诲姞搴曠嚎)</para>
/// <para>瀹冪殑闀垮害涓猴細褰撳墠鎺т欢瀹藉害-宸﹀彸鍥哄畾闂磋窛-宸﹁竟鍥剧墖瀹藉害(濡傛灉鏈�)-鍙宠竟鐨勫亸绉婚噺</para>
- /// </summary>
+ /// </summary>
public virtual NormalViewControl AddBottomLine()
{
if (this.btnBottomLine != null)
@@ -90,7 +90,7 @@
/// <param name="i_caption">鍐呭</param>
/// <param name="i_width">瀹藉害</param>
/// <param name="real">鏄惁璁＄畻鐪熷疄鍊�</param>
- /// <returns></returns>
+ /// <returns></returns>
public NormalViewControl AddLeftCaption(string i_caption, int i_width, bool real = true)
{
if (real == true)
@@ -114,7 +114,7 @@
/// <param name="i_width">瀹藉害</param>
/// <param name="i_height">楂樺害</param>
/// <param name="real">鏄惁璁＄畻鐪熷疄鍊�</param>
- /// <returns></returns>
+ /// <returns></returns>
public NormalViewControl AddLeftCaption(string i_caption, int i_width, int i_height, bool real = true)
{
int XX = ControlCommonResourse.XXLeft + LeftOffset;
@@ -140,7 +140,7 @@
/// <param name="i_txtValue">鍒濆鍐呭</param>
/// <param name="i_width">瀹藉害</param>
/// <param name="real">鏄惁璁＄畻鐪熷疄鍊�</param>
- /// <returns></returns>
+ /// <returns></returns>
public TextInputControl AddLeftInput(string i_txtValue, int i_width, bool real = true)
{
if (real == true)
@@ -173,7 +173,7 @@
/// 娣诲姞宸﹁竟鍥炬爣
/// </summary>
/// <param name="i_Iconsize">鍥炬爣澶у皬</param>
- /// <returns></returns>
+ /// <returns></returns>
public IconViewControl AddLeftIcon(int i_Iconsize = 81)
{
var btnIcon = new IconViewControl(i_Iconsize);
@@ -217,7 +217,7 @@
/// <summary>
/// 娣诲姞鏈�鍙宠竟鐨勭┖鐧藉浘鐗囨帶浠�
/// </summary>
- /// <param name="i_width">鎺т欢绌哄害(闈炵湡瀹炲��)</param>
+ /// <param name="i_width">鎺т欢绌哄害(闈炵湡瀹炲��)</param>
/// <param name="i_height">鎺т欢楂樺害(闈炵湡瀹炲��)</param>
/// <returns></returns>
public MostRightIconControl AddMostRightEmptyIcon(int i_width, int i_height)
@@ -233,7 +233,7 @@
btnContr.X += RightOffset;
}
- this.rightIconSize = Application.GetMinRealAverage(i_width);
+ this.rightIconSize = this.GetPictrueRealSize(i_width);
if (chidrenYaxis != 0)
{
btnContr.btnIcon.Y += chidrenYaxis;
@@ -312,7 +312,7 @@
return btnContr;
}
- #endregion
+ #endregion
#region 鈻� 娣诲姞涓婇儴鐨勬樉绀烘枃鏈琠________________
@@ -322,7 +322,7 @@
/// <param name="i_caption">鍐呭</param>
/// <param name="i_width">瀹藉害</param>
/// <param name="real">鏄惁璁＄畻鐪熷疄鍊�</param>
- /// <returns></returns>
+ /// <returns></returns>
public NormalViewControl AddTopView(string i_caption, int i_width, bool real = true)
{
if (real == true)
@@ -337,7 +337,7 @@
return contr;
}
- #endregion
+ #endregion
#region 鈻� 娣诲姞涓嬮儴鐨勬樉绀烘枃鏈琠________________
@@ -347,7 +347,7 @@
/// <param name="i_caption">鍐呭</param>
/// <param name="i_width">瀹藉害</param>
/// <param name="real">鏄惁璁＄畻鐪熷疄鍊�</param>
- /// <returns></returns>
+ /// <returns></returns>
public NormalViewControl AddBottomView(string i_caption, int i_width, bool real = true)
{
if (real == true)
@@ -363,6 +363,6 @@
return contr;
}
- #endregion
- }
-}
+ #endregion
+ }
+}
--
Gitblit v1.8.0