From a5b3c4bae726ef6770d4bfcbf2f4b50a37ed4a15 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 06 三月 2020 15:31:36 +0800
Subject: [PATCH] 删除了郭雪城的 DeviceUi 这个类
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs
index 18859f5..d152b43 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs
@@ -26,6 +26,25 @@
/// </summary>
public FrameLayout bodyFrameLayout = null;
/// <summary>
+ /// 宸︽粦浣胯兘
+ /// </summary>
+ private bool m_ScrollEnabled = true;
+ /// <summary>
+ /// 宸︽粦浣胯兘
+ /// </summary>
+ public bool ScrollEnabled
+ {
+ get { return m_ScrollEnabled; }
+ set
+ {
+ if (UserView.HomePage.Instance.ScrollEnabled != value)
+ {
+ UserView.HomePage.Instance.ScrollEnabled = value;
+ this.m_ScrollEnabled = value;
+ }
+ }
+ }
+ /// <summary>
/// 缂撳瓨鍚姩鍙傛暟
/// </summary>
private object[] m_parameter = null;
@@ -46,6 +65,9 @@
//鍒濆鍖栦腑閮ㄦ帶浠�
this.InitBodyFrameLayout();
+
+ //鍒濆宸︽粦浣胯兘鍙�
+ this.ScrollEnabled = true;
}
/// <summary>
@@ -89,6 +111,12 @@
topFrameLayout.Name = "topFrameLayout";
this.AddChidren(topFrameLayout);
+ //绾�
+ var btnLine = new NormalViewControl(topFrameLayout.Width, 1, false);
+ btnLine.BackgroundColor = 0x40000000;
+ btnLine.Y = topFrameLayout.Height - 1;
+ topFrameLayout.AddChidren(btnLine);
+
//杩斿洖閿�
var btnBack = new BackViewControl();
topFrameLayout.AddChidren(btnBack);
@@ -101,8 +129,18 @@
topFrameLayout.AddTag("btnBack", btnBack);
//鏍囬
- var txttitle = new TopLayoutTitleControl();
+ var txttitle = new Button();
+ txttitle.Name = "txtTitle";
+ txttitle.TextSize = 17;
+ txttitle.X = Application.GetRealWidth(161);
+ txttitle.Height = Application.GetRealHeight(69);
+ txttitle.Width = Application.GetRealWidth(850);
+ txttitle.Gravity = Gravity.CenterVertical;
+ txttitle.TextColor = UserCenterColor.Current.TopLayoutTitleText;
+ txttitle.TextAlignment = TextAlignment.CenterLeft;
+ txttitle.IsBold = true;
topFrameLayout.AddChidren(txttitle);
+
topFrameLayout.AddTag("txtTitle", txttitle);
}
@@ -139,6 +177,8 @@
/// <param name="parameter">鍚姩鍙傛暟锛氬弬鏁扮敱鎸囧畾鐢婚潰鐨凷howForm鍑芥暟鎵�鎸囧畾</param>
public override void AddForm(params object[] parameter)
{
+ base.AddForm(parameter);
+
//妫�娴嬭兘鍚﹁拷鍔犵敾闈�
if (UserCenterLogic.CheckCanAddForm(this) == false)
{
@@ -164,11 +204,14 @@
/// </summary>
public override void CloseFormBefore()
{
+ base.CloseFormBefore();
+
+ //宸︽粦浣胯兘
+ this.ScrollEnabled = true;
+
this.m_parameter = null;
//娓呯┖bodyFrame
- this.ClearBodyFrame();
-
- base.CloseFormBefore();
+ this.ClearBodyFrame();
}
#endregion
@@ -252,7 +295,7 @@
btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
bodyFrameLayout.AddChidren(btnHelp);
//搴曠嚎
- int lineWidth = btnHelp.GetRealWidthByText(12);
+ int lineWidth = btnHelp.GetRealWidthByText();
var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
btnLine.Gravity = Gravity.CenterHorizontal;
--
Gitblit v1.8.0