From 3dcbd186c42c598c0c08d1cd37034cf2baa09e54 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 15:47:51 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs | 51 ++++++++++++++++++++++++++++-----------------------
1 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs
index b1caac1..88d8da6 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs
@@ -40,20 +40,30 @@
/// 鍋氭垚涓�涓瓨鍦ㄤ簬鍙充笂瑙掔殑鑿滃崟鎺т欢
/// </summary>
/// <param name="i_RowCount">涓�鍏辨湁鍑犺(涓嶅惈鏍囬)</param>
- /// <param name="i_width">杩欎釜鑿滃崟鏈夊瀹�</param>
+ /// <param name="i_widthType">杩欎釜鑿滃崟鐨勫搴︽ā寮�,鐩墠鍙敮鎸�
+ /// <para>1: 395瀹藉害</para>
+ /// <para>2: 449瀹藉害</para>
+ /// </param>
/// <param name="titleText">鏍囬鏂囨湰(濡傛灉涓嶄负绌�,鑿滃崟妯″紡鍙樻洿涓烘嫢鏈夋爣棰樼殑妯″紡)</param>
- public TopRightMenuControl(int i_RowCount, int i_width = 395, string titleText = null)
+ public TopRightMenuControl(int i_RowCount, int i_widthType, string titleText = null)
{
this.RowCount = i_RowCount;
- this.RowWidth = i_width;
+ if (i_widthType == 1)
+ {
+ this.RowWidth = 395;
+ }
+ else if (i_widthType == 2)
+ {
+ this.RowWidth = 449;
+ }
//鍒濆鍖栫敾闈㈢殑鎺т欢
- this.InitFormControl(titleText);
+ this.InitFormControl(titleText, i_widthType);
}
/// <summary>
/// 鍒濆鍖栫敾闈㈢殑鎺т欢
/// </summary>
- private void InitFormControl(string titleText)
+ private void InitFormControl(string titleText, int i_widthType)
{
this.BackgroundColor = UserCenterColor.Current.DialogBackColor;
this.MouseUpEventHandler += (sender2, e2) =>
@@ -71,22 +81,24 @@
//鑿滃崟+1
rowCount++;
}
- //妗屽竷
+ //鑳屾櫙
+ var frameBack = new FrameLayout();
+ frameBack.X = Application.GetRealWidth(662 - (RowWidth - 395));
+ frameBack.Y = Application.GetRealHeight(161);
+ frameBack.Width = Application.GetRealWidth(RowWidth);
+ frameBack.Height = Application.GetRealHeight(RowHeight * rowCount + 16);
+ frameBack.BackgroundImagePath = "MenuGroud/TopRightMenu" + i_widthType + "_" + rowCount + ".png";
+ this.AddChidren(frameBack);
+
var frameTable = new FrameLayout();
- frameTable.X = Application.GetRealWidth(662 - (RowWidth - 395));
- frameTable.Y = Application.GetRealHeight(158 + 15 + 1);
- frameTable.Width = Application.GetRealWidth(RowWidth);
- frameTable.Height = Application.GetRealHeight(RowHeight * rowCount);
- frameTable.BackgroundColor = UserCenterColor.Current.White;
- frameTable.BorderColor = UserCenterColor.Current.Transparent;
- frameTable.Radius = (uint)Application.GetRealHeight(17);
- this.AddChidren(frameTable);
+ frameTable.Y = Application.GetRealHeight(16);
+ frameBack.AddChidren(frameTable);
if (titleText != null)
{
- var btnTitle = new NormalViewControl(frameTable.Width - Application.GetRealWidth(81), Application.GetRealHeight(58), false);
+ var btnTitle = new NormalViewControl(frameBack.Width - Application.GetRealWidth(81), Application.GetRealHeight(58), false);
btnTitle.X = Application.GetRealWidth(81);
- btnTitle.Y = Application.GetRealHeight(58);
+ btnTitle.Y = Application.GetRealHeight(58 + 16);
btnTitle.Text = titleText;
frameTable.AddChidren(btnTitle);
}
@@ -106,13 +118,6 @@
}
listView.Radius = (uint)Application.GetRealHeight(17);
frameTable.AddChidren(listView);
-
- //涓夎褰㈠浘鏍�
- var btnTriangle = new PicViewControl(31, 15);
- btnTriangle.X = Application.GetRealWidth(980);
- btnTriangle.Y = Application.GetRealHeight(159);
- btnTriangle.UnSelectedImagePath = "Item/UpperTriangle.png";
- this.AddChidren(btnTriangle);
}
#endregion
--
Gitblit v1.8.0