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/UserCenter/UserMain/UserMainForm.cs | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
index 0f13170..db897ce 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
@@ -13,7 +13,7 @@
/// <summary>
/// 涓昏彍鍗曡儗鏅
/// </summary>
- private FrameLayout frameMainMenuBack = null;
+ private NormalFrameLayout frameMainMenuBack = null;
/// <summary>
/// 鍏朵粬鑿滃崟鐨勫鍣ㄦ帶浠�
/// </summary>
@@ -50,10 +50,14 @@
/// </summary>
public void ShowForm()
{
+ this.FormID = "UserMainForm";
+
//鐗规畩澶勭悊锛氭仮澶嶅彲鍏抽棴杩涘害鏉★紝鍒棶涓轰粈涔堬紝鎴戜篃涓嶇煡閬撲负浠�涔堬紝浠ラ槻涓囦竴鑰屽凡
ProgressBar.SetCloseBarFlag(false);
- //鍒濆鍖栨鏋�
- this.InitForm();
+ //鍒濆鍖栧ご閮ㄦ帶浠�
+ this.InitTopFrameLayout();
+ //鍒濆鍖栦腑閮ㄦ帶浠�
+ this.InitBodyFrameLayout();
//绉婚櫎杩斿洖閿�
base.RemoveBackButton();
@@ -214,7 +218,7 @@
else
{
//鑳屾櫙妗�
- frameMainMenuBack = new FrameLayout();
+ frameMainMenuBack = new NormalFrameLayout();
frameMainMenuBack.Y = Application.GetRealHeight(288);
frameMainMenuBack.Gravity = Gravity.CenterHorizontal;
frameMainMenuBack.Height = Application.GetRealHeight(371);
--
Gitblit v1.8.0