From 652243206427f35a256400a149a1734085824cb9 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 02 九月 2020 17:35:03 +0800
Subject: [PATCH] 2020-09-02-4
---
ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs | 94 ++++++++++++++++++++++++++---------------------
1 files changed, 52 insertions(+), 42 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs b/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
index d0417ce..0cbedac 100755
--- a/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
@@ -21,15 +21,15 @@
/// <summary>
/// TopMenuFrameLayout
/// </summary>
- public FrameLayout topMenuFrameLayout = null;
+ public NormalFrameLayout topMenuFrameLayout = null;
/// <summary>
/// TopFrameLayout
/// </summary>
- public FrameLayout topFrameLayout = null;
+ public NormalFrameLayout topFrameLayout = null;
/// <summary>
/// bodyFrameLayout
/// </summary>
- public FrameLayout bodyFrameLayout = null;
+ public NormalFrameLayout bodyFrameLayout = null;
/// <summary>
/// 宸︽粦浣胯兘
/// </summary>
@@ -102,14 +102,14 @@
}
//TopMenuFrameLayout鍋氭垚
- topMenuFrameLayout = new FrameLayout();
+ topMenuFrameLayout = new NormalFrameLayout();
topMenuFrameLayout.Height = ControlCommonResourse.TopMenuFrameHeight;
topMenuFrameLayout.BackgroundColor = UserCenterColor.Current.TopFrameLayout;
topMenuFrameLayout.Name = "topMenuFrameLayout";
this.AddChidren(topMenuFrameLayout);
//TopFrameLayout鍋氭垚
- topFrameLayout = new FrameLayout();
+ topFrameLayout = new NormalFrameLayout();
topFrameLayout.Height = ControlCommonResourse.TopFrameHeight;
topFrameLayout.BackgroundColor = UserCenterColor.Current.TopFrameLayout;
topFrameLayout.Y = topMenuFrameLayout.Bottom;
@@ -121,6 +121,7 @@
btnLine.BackgroundColor = 0x40000000;
btnLine.Y = topFrameLayout.Height - 1;
topFrameLayout.AddChidren(btnLine);
+ topFrameLayout.AddTag("btnLine", btnLine);
//杩斿洖閿�
var btnBack = new BackViewControl();
@@ -168,7 +169,7 @@
{
bodyFrameLayout.RemoveAll();
}
- bodyFrameLayout = new FrameLayout();
+ bodyFrameLayout = new NormalFrameLayout();
bodyFrameLayout.Height = ControlCommonResourse.BodyFrameHeight;
bodyFrameLayout.Y = topFrameLayout.Bottom;
bodyFrameLayout.BackgroundColor = UserCenterColor.Current.BodyFrameLayout;
@@ -188,13 +189,16 @@
/// <param name="parameter">鍚姩鍙傛暟锛氬弬鏁扮敱鎸囧畾鐢婚潰鐨凷howForm鍑芥暟鎵�鎸囧畾</param>
public override void AddForm(params object[] parameter)
{
+ //鐣岄潰鍔犺浇涓�
+ ControlCommonResourse.IsFormAdding = true;
+
base.AddForm(parameter);
- //妫�娴嬭兘鍚﹁拷鍔犵敾闈�
- if (UserCenterLogic.CheckCanAddForm(this) == false)
- {
- return;
- }
+ //妫�娴嬭兘鍚﹁拷鍔犵敾闈� 2020.05.14鑸嶅純
+ //if (UserCenterLogic.CheckCanAddForm(this) == false)
+ //{
+ // return;
+ //}
UserView.HomePage.Instance.AddChidren(this);
UserView.HomePage.Instance.PageIndex += 1;
@@ -204,6 +208,9 @@
//鎵цShowForm()鏂规硶
this.LoadShowFormMethod(parameter);
+
+ //鐣岄潰鍔犺浇缁撴潫
+ ControlCommonResourse.IsFormAdding = false;
}
#endregion
@@ -225,9 +232,38 @@
this.m_parameter = null;
//娓呯┖bodyFrame
this.ClearBodyFrame();
- }
+ }
#endregion
+
+ #region 鈻� 娣诲姞甯姪鎺т欢_______________________
+
+ /// <summary>
+ /// 娣诲姞鏌ョ湅甯姪鎺т欢
+ /// </summary>
+ /// <returns></returns>
+ public NormalViewControl AddHelpControl()
+ {
+ //鏌ョ湅甯姪
+ var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
+ btnHelp.Y = Application.GetRealHeight(1388);
+ btnHelp.TextSize = 12;
+ btnHelp.TextAlignment = TextAlignment.Center;
+ btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor;
+ btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
+ bodyFrameLayout.AddChidren(btnHelp);
+ //搴曠嚎
+ int lineWidth = btnHelp.GetRealWidthByText();
+ var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
+ btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
+ btnLine.Gravity = Gravity.CenterHorizontal;
+ btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
+ bodyFrameLayout.AddChidren(btnLine);
+
+ return btnHelp;
+ }
+
+ #endregion
#region 鈻� 鏄剧ず閲嶆柊鍔犺浇_______________________
@@ -236,7 +272,7 @@
/// </summary>
public override void ShowReLoadView()
{
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
if (bodyFrameLayout == null || bodyFrameLayout.Parent == null)
{
@@ -256,6 +292,9 @@
frame.AddChidren(btnReLoad);
btnReLoad.ButtonClickEvent += (sender, e) =>
{
+ //鐐瑰嚮閲嶆柊鍔犺浇鏃�,鍏佽鍐嶆鑱旂綉
+ HdlWifiLogic.Current.CanAccessHttp = true;
+
//娓呴櫎鍏ㄩ儴鎺т欢
this.ClearBodyFrame();
@@ -289,35 +328,6 @@
{
}
- #endregion
-
- #region 鈻� 娣诲姞甯姪鎺т欢_______________________
-
- /// <summary>
- /// 娣诲姞鏌ョ湅甯姪鎺т欢
- /// </summary>
- /// <returns></returns>
- public NormalViewControl AddHelpControl()
- {
- //鏌ョ湅甯姪
- var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
- btnHelp.Y = Application.GetRealHeight(1388);
- btnHelp.TextSize = 12;
- btnHelp.TextAlignment = TextAlignment.Center;
- btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor;
- btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
- bodyFrameLayout.AddChidren(btnHelp);
- //搴曠嚎
- int lineWidth = btnHelp.GetRealWidthByText();
- var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
- btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
- btnLine.Gravity = Gravity.CenterHorizontal;
- btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
- bodyFrameLayout.AddChidren(btnLine);
-
- return btnHelp;
- }
-
#endregion
#region 鈻� 鏄剧ず娌℃湁鏁版嵁鐨勫浘鍍忔樉绀虹壒鏁坃________
--
Gitblit v1.8.0