From ed2f4a97aa48cdb4a013d2a389877f52eb3eccdf Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 13:15:59 +0800
Subject: [PATCH] Merge branch 'DEV_GXC' of http://172.16.1.23:6688/r/~xm/HomeApp into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs | 34 +++++-----------------------------
1 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
index fc53b31..77ba2cb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
@@ -22,14 +22,6 @@
/// 鐢ㄦ埛韬唤
/// </summary>
private NormalViewControl btnAuthority = null;
- /// <summary>
- /// 鐢ㄦ埛澶村儚
- /// </summary>
- private IconViewControl btnUserIcon = null;
- /// <summary>
- /// 鐨囧啝
- /// </summary>
- private IconViewControl btnImperialCrown = null;
#endregion
@@ -107,7 +99,7 @@
private void InitUserInfoControl(FrameLayout frameWhite)
{
//鐢ㄦ埛澶村儚
- this.btnUserIcon = new IconViewControl(280);
+ var btnUserIcon = new IconViewControl(280);
btnUserIcon.X = Application.GetRealWidth(121);
btnUserIcon.UnSelectedImagePath = UserCenterResourse.UserInfo.UserIconFile;
bodyFrameLayout.AddChidren(btnUserIcon);
@@ -121,7 +113,7 @@
if (UserCenterResourse.UserInfo.AuthorityNo == 1)
{
//鐨囧啝
- this.btnImperialCrown = new IconViewControl(60);
+ var btnImperialCrown = new IconViewControl(60);
btnImperialCrown.X = Application.GetRealWidth(346);
btnImperialCrown.Y = Application.GetRealHeight(475);
btnImperialCrown.UnSelectedImagePath = "Center/ImperialCrown.png";
@@ -129,7 +121,7 @@
}
//鐢ㄦ埛鏄电О
- this.btnUserName = new NormalViewControl(605, 60, true);
+ btnUserName = new NormalViewControl(605, 60, true);
btnUserName.X = btnUserIcon.Right + Application.GetRealWidth(5);
btnUserName.Y = Application.GetRealHeight(43);
if (UserCenterResourse.UserInfo != null)
@@ -411,11 +403,8 @@
/// </summary>
public override int FormActionAgainEvent()
{
- //鐢ㄦ埛澶村儚
- if (btnUserIcon.UnSelectedImagePath != UserCenterResourse.UserInfo.UserIconFile)
- {
- btnUserIcon.UnSelectedImagePath = UserCenterResourse.UserInfo.UserIconFile;
- }
+ //涓嶈鍒犻櫎杩欎釜鍑芥暟
+ base.FormActionAgainEvent();
//鐢ㄦ埛鍚嶅瓧
btnUserName.Text = UserCenterResourse.UserInfo.UserName;
if (UserCenterResourse.UserInfo != null)
@@ -423,19 +412,6 @@
//鐢ㄦ埛韬唤
btnAuthority.Text = UserCenterResourse.UserInfo.AuthorityText;
}
- if (this.btnImperialCrown != null)
- {
- //鐨囧啝
- if (UserCenterResourse.UserInfo.AuthorityNo != 1)
- {
- this.btnImperialCrown.Visible = false;
- }
- else
- {
- this.btnImperialCrown.Visible = true;
- }
- }
-
//鍒濆鍖栦富鑿滃崟鐨勬帶浠�
this.InitMainMenuInfoControl(frameWhiteBack);
--
Gitblit v1.8.0