From 9ef48d7b2da7c408b53f73be0f6eef3cbac1c84a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 19 十一月 2020 10:23:45 +0800
Subject: [PATCH] Evoyo.Home1.1.0120111601_Release
---
ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
index ee92d35..b4ace58 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,17 +50,20 @@
/// </summary>
public void ShowForm()
{
+ this.FormID = "UserMainForm";
+
//鐗规畩澶勭悊锛氭仮澶嶅彲鍏抽棴杩涘害鏉★紝鍒棶涓轰粈涔堬紝鎴戜篃涓嶇煡閬撲负浠�涔堬紝浠ラ槻涓囦竴鑰屽凡
ProgressBar.SetCloseBarFlag(false);
- //鍒濆鍖栨鏋�
- this.InitForm();
+ //鍒濆鍖栧ご閮ㄦ帶浠�
+ this.InitTopFrameLayout();
+ //鍒濆鍖栦腑閮ㄦ帶浠�
+ this.InitBodyFrameLayout();
//绉婚櫎杩斿洖閿�
base.RemoveBackButton();
//body鍗犲畬鏁翠釜灞忓箷,闄や簡搴曢儴鑿滃崟
bodyFrameLayout.Y = 0;
- bodyFrameLayout.Height = ControlCommonResourse.TopMenuFrameHeight + ControlCommonResourse.TopFrameHeight
- + ControlCommonResourse.BodyFrameHeight - ControlCommonResourse.BottomFrameHeight;
+ bodyFrameLayout.Height = this.Height;
bodyFrameLayout.BackgroundColor = UserCenterColor.Current.BlackBackGround;
//鍒濆鍖栦腑閮ㄦ帶浠�
@@ -76,7 +79,7 @@
this.ClearBodyFrame();
//涓汉涓績
- var btnTitle = new NormalViewControl(350, 100, true);
+ var btnTitle = new NormalViewControl(450, 100, true);
btnTitle.X = ControlCommonResourse.XXLeft;
btnTitle.Y = Application.GetRealHeight(112);
btnTitle.TextColor = UserCenterColor.Current.White;
@@ -215,7 +218,7 @@
else
{
//鑳屾櫙妗�
- frameMainMenuBack = new FrameLayout();
+ frameMainMenuBack = new NormalFrameLayout();
frameMainMenuBack.Y = Application.GetRealHeight(288);
frameMainMenuBack.Gravity = Gravity.CenterHorizontal;
frameMainMenuBack.Height = Application.GetRealHeight(371);
@@ -311,7 +314,7 @@
frame.ButtonClickEvent += (sender, e) =>
{
//浣忓畢鎺ュ彛涓嶉渶瑕佺壒娈婄殑鐧婚檰Token
- var form = new Residence.ResidenceListForm();
+ var form = new Residence.ResidenceListMainForm();
form.AddForm();
};
}
@@ -469,11 +472,6 @@
btnAbountView.X -= ControlCommonResourse.XXLeft / 2;
rowAbount.ButtonClickEvent += (sender, e) =>
{
- if (Common.Config.Instance.Home.IsVirtually == true)
- {
- //濡傛灉浣忓畢涓鸿櫄鎷熶綇瀹�,鍒欐鍔熻兘鏃犳晥
- return;
- }
var form = new Abount.AbountForm();
form.AddForm();
};
--
Gitblit v1.8.0