From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码
---
ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs b/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
index f7b2221..b384af6 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;
@@ -291,6 +292,9 @@
frame.AddChidren(btnReLoad);
btnReLoad.ButtonClickEvent += (sender, e) =>
{
+ //鐐瑰嚮閲嶆柊鍔犺浇鏃�,鍏佽鍐嶆鑱旂綉
+ HdlWifiLogic.Current.CanAccessHttp = true;
+
//娓呴櫎鍏ㄩ儴鎺т欢
this.ClearBodyFrame();
--
Gitblit v1.8.0