From 3dcbd186c42c598c0c08d1cd37034cf2baa09e54 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 15:47:51 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs | 53 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
index 591c299..4ce6701 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
@@ -75,12 +75,6 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
- //淇℃伅鎻愮ず鎺т欢
- this.msgControl = new MessageManagementControl();
- msgControl.Y = Application.GetRealHeight(127);
- msgControl.X = Application.GetRealWidth(953);
- bodyFrameLayout.AddChidren(this.msgControl);
-
//涓汉涓績
var btnTitle = new NormalViewControl(350, 100, true);
btnTitle.X = ControlCommonResourse.XXLeft;
@@ -90,6 +84,21 @@
btnTitle.IsBold = true;
btnTitle.TextID = R.MyInternationalizationString.UserCenter;
bodyFrameLayout.AddChidren(btnTitle);
+
+ var btnBack1 = new PicViewControl(1031, 942);
+ btnBack1.Y = btnTitle.Bottom - Application.GetRealHeight(10);
+ btnBack1.UnSelectedImagePath = "Center/MainBack1.png";
+ bodyFrameLayout.AddChidren(btnBack1);
+ var btnBack2 = new PicViewControl(392, 172);
+ btnBack2.X = Application.GetRealWidth(688);
+ btnBack2.UnSelectedImagePath = "Center/MainBack2.png";
+ bodyFrameLayout.AddChidren(btnBack2);
+
+ //淇℃伅鎻愮ず鎺т欢
+ this.msgControl = new MessageManagementControl();
+ msgControl.Y = Application.GetRealHeight(127);
+ msgControl.X = Application.GetRealWidth(953);
+ bodyFrameLayout.AddChidren(this.msgControl);
//鐧芥
var frameBack = new FrameLayout();
@@ -136,14 +145,15 @@
form.AddForm();
};
- if (UserCenterResourse.UserInfo.AuthorityNo == 1)
+ //鐨囧啝
+ this.btnImperialCrown = new IconViewControl(60);
+ btnImperialCrown.X = Application.GetRealWidth(346);
+ btnImperialCrown.Y = Application.GetRealHeight(475);
+ btnImperialCrown.UnSelectedImagePath = "Center/ImperialCrown.png";
+ bodyFrameLayout.AddChidren(btnImperialCrown);
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
{
- //鐨囧啝
- this.btnImperialCrown = new IconViewControl(60);
- btnImperialCrown.X = Application.GetRealWidth(346);
- btnImperialCrown.Y = Application.GetRealHeight(475);
- btnImperialCrown.UnSelectedImagePath = "Center/ImperialCrown.png";
- bodyFrameLayout.AddChidren(btnImperialCrown);
+ btnImperialCrown.Visible = false;
}
//鐢ㄦ埛鏄电О
@@ -475,17 +485,14 @@
//鐢ㄦ埛韬唤
btnAuthority.Text = UserCenterResourse.UserInfo.AuthorityText;
}
- if (this.btnImperialCrown != null)
+ //鐨囧啝
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
{
- //鐨囧啝
- if (UserCenterResourse.UserInfo.AuthorityNo != 1)
- {
- this.btnImperialCrown.Visible = false;
- }
- else
- {
- this.btnImperialCrown.Visible = true;
- }
+ this.btnImperialCrown.Visible = false;
+ }
+ else
+ {
+ this.btnImperialCrown.Visible = true;
}
//鍒锋柊淇℃伅鎻愮ず鎺т欢
--
Gitblit v1.8.0