From dfcb2a1844fd55b57bae23e290b30ec6380e8508 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期五, 26 八月 2022 15:04:22 +0800
Subject: [PATCH] 更新全视通dll
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/RowLayoutControl.cs | 145 +++++++++++++++++++++++++----------------------
1 files changed, 77 insertions(+), 68 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/RowLayoutControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/RowLayoutControl.cs
old mode 100755
new mode 100644
index 380731e..6463d88
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/RowLayoutControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/RowLayoutControl.cs
@@ -6,105 +6,114 @@
/// <summary>
/// 鍋氭垚涓�涓偣鍑昏兘澶熸樉绀洪�変腑鐘舵�佽儗鏅壊鐨凴owLayout(鎷ユ湁妗屽竷)
/// </summary>
- public class RowLayoutControl : RowLayout
- {
+ public class RowLayoutControl : RowLayoutBase
+ {
#region 鈻� 鍙橀噺澹版槑___________________________
- /// <summary>
- /// 妗屽竷鎺т欢
+ /// <summary>
+ /// 妗屽竷鎺т欢
/// </summary>
private FrameRowControl m_frameTable = null;
- /// <summary>
- /// 妗屽竷鎺т欢
+ /// <summary>
+ /// 妗屽竷鎺т欢
/// </summary>
- public FrameRowControl frameTable
- {
- get
- {
- if (m_frameTable == null) { this.InitFrameTableControl(); }
- return m_frameTable;
- }
+ public FrameRowControl frameTable
+ {
+ get
+ {
+ if (m_frameTable == null) { this.InitFrameTableControl(); }
+ return m_frameTable;
+ }
}
- /// <summary>
- /// 姝ゆ帶浠剁殑璇嗗埆涓婚敭(鑷畾涔夎缃殑)
+ /// <summary>
+ /// 姝ゆ帶浠剁殑璇嗗埆涓婚敭(鑷畾涔夎缃殑)
/// </summary>
public string MainKeys = string.Empty;
- /// <summary>
- /// 瀛愭帶浠禮杞村亸绉婚噺(鍏遍�氬畾涔夎�屽凡,鏈変簺鐣岄潰闇�瑕佽繖绉嶇壒娈婃搷浣�)
+ /// <summary>
+ /// 瀛愭帶浠禮杞村亸绉婚噺(鍏遍�氬畾涔夎�屽凡,鏈変簺鐣岄潰闇�瑕佽繖绉嶇壒娈婃搷浣�)
/// </summary>
- public int chidrenYaxis = 0;
-
+ public int chidrenYaxis = 0;
+
#endregion
-
- #region 鈻� 鍒濆鍖朹____________________________
-
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
/// <summary>
/// 鍋氭垚涓�涓偣鍑昏兘澶熸樉绀洪�変腑鐘舵�佽儗鏅壊鐨凴owLayout(鎷ユ湁妗屽竷)
/// </summary>
- /// <param name="ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(鐪熷疄鍊�,鏈変簺鐣岄潰闇�瑕佽繖绉嶇壒娈婃搷浣�)</param>
+ /// <param name="ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(銆愬垪琛ㄦ帶浠剁殑rowSpace/2銆戝嵆鍙�,涓嶆噦榛樿涓�0鍗冲彲)</param>
public RowLayoutControl(int i_ChidrenYaxis = 0)
{
- this.LineColor = UserCenterColor.Current.Transparent;
-
+ this.LineColor = UserCenterColor.Current.Transparent;
+ this.SubViewWidth = Application.GetRealWidth(184);
+
this.chidrenYaxis = i_ChidrenYaxis;
- this.Height = ControlCommonResourse.ListViewRowHeight;
+ this.Height = ControlCommonResourse.ListViewRowHeight;
this.Width = Application.CurrentWidth;
- }
-
- /// <summary>
- /// 鍒濆鍖栨甯冩帶浠�
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栨甯冩帶浠�
/// </summary>
- private void InitFrameTableControl()
- {
- this.m_frameTable = new FrameRowControl(chidrenYaxis);
- this.m_frameTable.Height = this.Height;
- base.AddChidren(frameTable);
- }
-
+ private void InitFrameTableControl()
+ {
+ this.m_frameTable = new FrameRowControl(chidrenYaxis);
+ this.m_frameTable.Height = this.Height;
+ base.AddChidren(frameTable);
+ }
+
#endregion
-
+
#region 鈻� 娣诲姞鍒犻櫎鎺т欢_______________________
- /// <summary>
- /// 娣诲姞鍒犻櫎鎺т欢
- /// </summary>
+ /// <summary>
+ /// 娣诲姞鍒犻櫎鎺т欢
+ /// </summary>
/// <returns></returns>
- public NormalViewControl AddDeleteControl()
- {
- //鍒犻櫎
- var btnDelete = new NormalViewControl(Application.GetRealWidth(184), this.Height, false);
- btnDelete.BackgroundColor = 0xfff75858;
- btnDelete.TextSize = 12;
- btnDelete.TextColor = UserCenterColor.Current.White;
- btnDelete.TextAlignment = TextAlignment.Center;
- btnDelete.TextID = R.MyInternationalizationString.uDelete;
- this.AddRightView(btnDelete);
-
- return btnDelete;
+ public NormalViewControl AddDeleteControl()
+ {
+ //鍒犻櫎
+ var btnDelete = new NormalViewControl(Application.GetRealWidth(184), this.Height, false);
+ btnDelete.BackgroundColor = 0xfff75858;
+ btnDelete.TextSize = 12;
+ btnDelete.TextColor = UserCenterColor.Current.White;
+ btnDelete.TextAlignment = TextAlignment.Center;
+ btnDelete.TextID = R.MyInternationalizationString.uDelete;
+ this.AddRightView(btnDelete);
+
+ return btnDelete;
}
#endregion
#region 鈻� 娣诲姞缂栬緫鎺т欢_______________________
- /// <summary>
- /// 娣诲姞缂栬緫鎺т欢
- /// </summary>
+ /// <summary>
+ /// 娣诲姞缂栬緫鎺т欢
+ /// </summary>
+ /// <param name="hideMenuByClick">鐐瑰嚮鏃�,鏄惁闅愯棌宸︽粦鑿滃崟</param>
/// <returns></returns>
- public NormalViewControl AddEditorControl()
- {
- var btnEditor = new NormalViewControl(Application.GetRealWidth(184), this.Height, false);
- btnEditor.BackgroundColor = 0xff4a4a4a;
- btnEditor.TextSize = 12;
- btnEditor.TextColor = UserCenterColor.Current.White;
- btnEditor.TextAlignment = TextAlignment.Center;
- btnEditor.TextID = R.MyInternationalizationString.uEditor;
- this.AddRightView(btnEditor);
-
- return btnEditor;
+ public NormalViewControl AddEditorControl(bool hideMenuByClick = true)
+ {
+ var btnEditor = new NormalViewControl(Application.GetRealWidth(184), this.Height, false);
+ btnEditor.BackgroundColor = 0xff4a4a4a;
+ btnEditor.TextSize = 12;
+ btnEditor.TextColor = UserCenterColor.Current.White;
+ btnEditor.TextAlignment = TextAlignment.Center;
+ btnEditor.TextID = R.MyInternationalizationString.uEditor;
+ this.AddRightView(btnEditor);
+ if (hideMenuByClick == true)
+ {
+ btnEditor.ButtonClickEvent += (sender, e) =>
+ {
+ //鍏抽棴宸︽粦鑿滃崟
+ this.HideMenu();
+ };
+ }
+
+ return btnEditor;
}
#endregion
-
}
}
--
Gitblit v1.8.0