From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/Phone/Common/Base/EditorCommonForm.cs | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs b/ZigbeeApp/Shared/Phone/Common/Base/EditorCommonForm.cs
similarity index 95%
rename from ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
rename to ZigbeeApp/Shared/Phone/Common/Base/EditorCommonForm.cs
index c8aaf72..b9b4488 100644
--- a/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/Common/Base/EditorCommonForm.cs
@@ -1,13 +1,12 @@
锘縰sing Shared.Phone.UserCenter;
using System;
using System.Collections.Generic;
-using System.Threading.Tasks;
namespace Shared.Phone
{
/// <summary>
/// 涓汉涓績鐨勫叡閫氬熀灞傜敾闈紝缁ф壙浜庢鍏遍�氱殑鐢婚潰锛岃浣跨敤AddForm()鍑芥暟锛�
- /// 鎴栬�匒ddFromAndRemoveNowForm()鍑芥暟瀹炵幇娣诲姞鐢婚潰锛岀劧鍚庡湪鍚勮嚜鐨勭敾闈腑锛�
+ /// 鎴栬�匒ddFormAndCloseNowForm()鍑芥暟瀹炵幇娣诲姞鐢婚潰锛岀劧鍚庡湪鍚勮嚜鐨勭敾闈腑锛�
/// 瀹炵幇涓�涓猄howForm()鐨勫嚱鏁�(鍙傛暟鐢辨坊鍔犵敾闈㈡椂锛屼娇鐢ㄧ殑鍑芥暟鐨勫弬鏁版寚瀹�)
/// </summary>
public class EditorCommonForm : CommonFormBase
@@ -103,14 +102,14 @@
//TopMenuFrameLayout鍋氭垚
topMenuFrameLayout = new NormalFrameLayout();
- topMenuFrameLayout.Height = ControlCommonResourse.TopMenuFrameHeight;
+ topMenuFrameLayout.Height = HdlControlResourse.TopMenuFrameHeight;
topMenuFrameLayout.BackgroundColor = UserCenterColor.Current.TopFrameLayout;
topMenuFrameLayout.Name = "topMenuFrameLayout";
this.AddChidren(topMenuFrameLayout);
//TopFrameLayout鍋氭垚
topFrameLayout = new NormalFrameLayout();
- topFrameLayout.Height = ControlCommonResourse.TopFrameHeight;
+ topFrameLayout.Height = HdlControlResourse.TopFrameHeight;
topFrameLayout.BackgroundColor = UserCenterColor.Current.TopFrameLayout;
topFrameLayout.Y = topMenuFrameLayout.Bottom;
topFrameLayout.Name = "topFrameLayout";
@@ -170,7 +169,7 @@
bodyFrameLayout.RemoveAll();
}
bodyFrameLayout = new NormalFrameLayout();
- bodyFrameLayout.Height = ControlCommonResourse.BodyFrameHeight;
+ bodyFrameLayout.Height = HdlControlResourse.BodyFrameHeight;
bodyFrameLayout.Y = topFrameLayout.Bottom;
bodyFrameLayout.BackgroundColor = UserCenterColor.Current.BodyFrameLayout;
bodyFrameLayout.Name = "bodyFrameLayout";
@@ -190,7 +189,7 @@
public override void AddForm(params object[] parameter)
{
//鐣岄潰鍔犺浇涓�
- ControlCommonResourse.IsFormAdding = true;
+ HdlControlResourse.IsFormAdding = true;
base.AddForm(parameter);
@@ -210,7 +209,7 @@
this.LoadShowFormMethod(parameter);
//鐣岄潰鍔犺浇缁撴潫
- ControlCommonResourse.IsFormAdding = false;
+ HdlControlResourse.IsFormAdding = false;
}
#endregion
@@ -254,7 +253,7 @@
bodyFrameLayout.AddChidren(btnHelp);
//搴曠嚎
int lineWidth = btnHelp.GetRealWidthByText();
- var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
+ var btnLine = new NormalViewControl(lineWidth, HdlControlResourse.BottomLineHeight, false);
btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
btnLine.Gravity = Gravity.CenterHorizontal;
btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
@@ -292,9 +291,6 @@
frame.AddChidren(btnReLoad);
btnReLoad.ButtonClickEvent += (sender, e) =>
{
- //鐐瑰嚮閲嶆柊鍔犺浇鏃�,鍏佽鍐嶆鑱旂綉
- HdlWifiLogic.Current.CanAccessHttp = true;
-
//娓呴櫎鍏ㄩ儴鎺т欢
this.ClearBodyFrame();
--
Gitblit v1.8.0