From 4b378188ce972df432b23d9cb73babb6cc0679c6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 17 一月 2020 14:56:15 +0800
Subject: [PATCH] 合并代码 ver.10086
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/EditorCommonForm.cs | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 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..0340111 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);
@@ -103,6 +131,8 @@
//鏍囬
var txttitle = new TopLayoutTitleControl();
topFrameLayout.AddChidren(txttitle);
+ //绮椾綋
+ txttitle.IsBold = true;
topFrameLayout.AddTag("txtTitle", txttitle);
}
@@ -164,6 +194,9 @@
/// </summary>
public override void CloseFormBefore()
{
+ //宸︽粦浣胯兘
+ this.ScrollEnabled = true;
+
this.m_parameter = null;
//娓呯┖bodyFrame
this.ClearBodyFrame();
@@ -252,7 +285,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