From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Common/Base/EditorCommonForm.cs b/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
similarity index 96%
rename from ZigbeeApp/Shared/Phone/Common/Base/EditorCommonForm.cs
rename to ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
index 6dea851..c8aaf72 100644
--- a/ZigbeeApp/Shared/Phone/Common/Base/EditorCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
@@ -1,6 +1,7 @@
锘縰sing Shared.Phone.UserCenter;
using System;
using System.Collections.Generic;
+using System.Threading.Tasks;
namespace Shared.Phone
{
@@ -102,14 +103,14 @@
//TopMenuFrameLayout鍋氭垚
topMenuFrameLayout = new NormalFrameLayout();
- topMenuFrameLayout.Height = HdlControlResourse.TopMenuFrameHeight;
+ topMenuFrameLayout.Height = ControlCommonResourse.TopMenuFrameHeight;
topMenuFrameLayout.BackgroundColor = UserCenterColor.Current.TopFrameLayout;
topMenuFrameLayout.Name = "topMenuFrameLayout";
this.AddChidren(topMenuFrameLayout);
//TopFrameLayout鍋氭垚
topFrameLayout = new NormalFrameLayout();
- topFrameLayout.Height = HdlControlResourse.TopFrameHeight;
+ topFrameLayout.Height = ControlCommonResourse.TopFrameHeight;
topFrameLayout.BackgroundColor = UserCenterColor.Current.TopFrameLayout;
topFrameLayout.Y = topMenuFrameLayout.Bottom;
topFrameLayout.Name = "topFrameLayout";
@@ -169,7 +170,7 @@
bodyFrameLayout.RemoveAll();
}
bodyFrameLayout = new NormalFrameLayout();
- bodyFrameLayout.Height = HdlControlResourse.BodyFrameHeight;
+ bodyFrameLayout.Height = ControlCommonResourse.BodyFrameHeight;
bodyFrameLayout.Y = topFrameLayout.Bottom;
bodyFrameLayout.BackgroundColor = UserCenterColor.Current.BodyFrameLayout;
bodyFrameLayout.Name = "bodyFrameLayout";
@@ -189,7 +190,7 @@
public override void AddForm(params object[] parameter)
{
//鐣岄潰鍔犺浇涓�
- HdlControlResourse.IsFormAdding = true;
+ ControlCommonResourse.IsFormAdding = true;
base.AddForm(parameter);
@@ -209,7 +210,7 @@
this.LoadShowFormMethod(parameter);
//鐣岄潰鍔犺浇缁撴潫
- HdlControlResourse.IsFormAdding = false;
+ ControlCommonResourse.IsFormAdding = false;
}
#endregion
@@ -253,7 +254,7 @@
bodyFrameLayout.AddChidren(btnHelp);
//搴曠嚎
int lineWidth = btnHelp.GetRealWidthByText();
- var btnLine = new NormalViewControl(lineWidth, HdlControlResourse.BottomLineHeight, false);
+ var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
btnLine.Gravity = Gravity.CenterHorizontal;
btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
@@ -291,6 +292,9 @@
frame.AddChidren(btnReLoad);
btnReLoad.ButtonClickEvent += (sender, e) =>
{
+ //鐐瑰嚮閲嶆柊鍔犺浇鏃�,鍏佽鍐嶆鑱旂綉
+ HdlWifiLogic.Current.CanAccessHttp = true;
+
//娓呴櫎鍏ㄩ儴鎺т欢
this.ClearBodyFrame();
--
Gitblit v1.8.0