From 2bf5ec775cb57d8015bee58c745a1e48081ff1b1 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 15 十月 2019 11:06:05 +0800
Subject: [PATCH] 首次合并了全部的代码
---
ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
index 3ce4dde..77ba2cb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
@@ -18,6 +18,10 @@
/// 鐢ㄦ埛鍚嶅瓧
/// </summary>
private NormalViewControl btnUserName = null;
+ /// <summary>
+ /// 鐢ㄦ埛韬唤
+ /// </summary>
+ private NormalViewControl btnAuthority = null;
#endregion
@@ -127,7 +131,7 @@
frameWhite.AddChidren(btnUserName);
//鐢ㄦ埛韬唤
- var btnAuthority = new NormalViewControl(605, 60, true);
+ this.btnAuthority = new NormalViewControl(605, 60, true);
btnAuthority.X = btnUserName.X;
btnAuthority.Y = btnUserName.Bottom;
btnAuthority.TextColor = UserCenterColor.Current.Gray;
@@ -244,7 +248,7 @@
frame.ButtonClickEvent += (sender, e) =>
{
//浣忓畢鎺ュ彛涓嶉渶瑕佺壒娈婄殑鐧婚檰Token
- var form = new Residence.ResidenceManagementForm();
+ var form = new Residence.ResidenceListForm();
form.AddForm();
};
}
@@ -397,12 +401,21 @@
/// <summary>
/// 鑷韩鐨勪笂灞傜晫闈㈠叧闂悗,瀹冭嚜韬浜庢渶涓婂眰鏃�,瑙﹀彂鐨勪簨浠�
/// </summary>
- public override void FormActionAgainEvent()
+ public override int FormActionAgainEvent()
{
+ //涓嶈鍒犻櫎杩欎釜鍑芥暟
+ base.FormActionAgainEvent();
//鐢ㄦ埛鍚嶅瓧
btnUserName.Text = UserCenterResourse.UserInfo.UserName;
+ if (UserCenterResourse.UserInfo != null)
+ {
+ //鐢ㄦ埛韬唤
+ btnAuthority.Text = UserCenterResourse.UserInfo.AuthorityText;
+ }
//鍒濆鍖栦富鑿滃崟鐨勬帶浠�
this.InitMainMenuInfoControl(frameWhiteBack);
+
+ return 1;
}
#endregion
--
Gitblit v1.8.0