From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs | 84 +++++++++++++++++++----------------------
1 files changed, 39 insertions(+), 45 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
index db897ce..34e157d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
@@ -79,8 +79,8 @@
this.ClearBodyFrame();
//涓汉涓績
- var btnTitle = new NormalViewControl(350, 100, true);
- btnTitle.X = ControlCommonResourse.XXLeft;
+ var btnTitle = new NormalViewControl(450, 100, true);
+ btnTitle.X = HdlControlResourse.XXLeft;
btnTitle.Y = Application.GetRealHeight(112);
btnTitle.TextColor = UserCenterColor.Current.White;
btnTitle.TextSize = 24;
@@ -141,7 +141,7 @@
btnUserIcon.X = Application.GetRealWidth(121);
if (Common.Config.Instance.Home.IsVirtually == false)
{
- btnUserIcon.ImageBytes = Shared.IO.FileUtils.ReadFile(UserCenterResourse.UserInfo.UserIconFile);
+ btnUserIcon.ImageBytes = Shared.IO.FileUtils.ReadFile(HdlFileNameResourse.UserHeadIconFile);
}
else
{
@@ -158,7 +158,7 @@
this.ShowMassage(ShowMsgType.Confirm, msg, () =>
{
//閫�鍑鸿处鍙�
- UserCenterLogic.ReLoginAgain(Common.Config.Instance.Account);
+ HdlAccountLogic.Current.ReLoginAgain(Common.Config.Instance.Account);
});
return;
}
@@ -172,7 +172,7 @@
btnImperialCrown.Y = Application.GetRealHeight(475);
btnImperialCrown.UnSelectedImagePath = "Center/ImperialCrown.png";
bodyFrameLayout.AddChidren(btnImperialCrown);
- if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
{
btnImperialCrown.Visible = false;
}
@@ -182,9 +182,9 @@
btnUserName.IsBold = true;
btnUserName.X = btnUserIcon.Right + Application.GetRealWidth(5);
btnUserName.Y = Application.GetRealHeight(43);
- if (UserCenterResourse.UserInfo != null)
+ if (HdlUserCenterResourse.UserInfo != null)
{
- btnUserName.Text = UserCenterResourse.UserInfo.UserName;
+ btnUserName.Text = HdlUserCenterResourse.UserInfo.NickName;
}
frameWhite.AddChidren(btnUserName);
@@ -194,10 +194,7 @@
btnAuthority.Y = btnUserName.Bottom;
btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor3;
btnAuthority.TextSize = 12;
- if (UserCenterResourse.UserInfo != null)
- {
- btnAuthority.Text = UserCenterResourse.UserInfo.AuthorityText;
- }
+ btnAuthority.Text = HdlUserCenterResourse.ResidenceOption.AuthorityText;
frameWhite.AddChidren(btnAuthority);
}
@@ -262,7 +259,7 @@
//鎴愬憳绠＄悊
string unSelectPic = "Center/MenberManagement.png";
int TextID = R.MyInternationalizationString.uMember;
- if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
+ if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1 || HdlUserCenterResourse.ResidenceOption.AuthorityNo == 2)
{
//鐢熸垚鎺т欢
var frame = this.CreatMainMenuControl(frameMenu, TextID, unSelectPic);
@@ -281,7 +278,7 @@
//璁惧绠＄悊
unSelectPic = "Center/DeviceManagement.png";
TextID = R.MyInternationalizationString.uDevice;
- if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
+ if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1 || HdlUserCenterResourse.ResidenceOption.AuthorityNo == 2)
{
//鐢熸垚鎺т欢
var frame = this.CreatMainMenuControl(frameMenu, TextID, unSelectPic);
@@ -289,7 +286,7 @@
{
HdlGatewayLogic.Current.RefreshAppOldSelectGatewayId();
//鎷ユ湁缃戝叧,鎴栬�呮槸铏氭嫙浣忓畢,鍒欒繘鍏ヨ澶囧垪琛ㄧ晫闈�
- if (string.IsNullOrEmpty(GatewayResourse.AppOldSelectGatewayId) == false
+ if (string.IsNullOrEmpty(HdlGatewayResourse.AppOldSelectGatewayId) == false
|| Common.Config.Instance.Home.IsVirtually == true)
{
var form = new Device.DeviceListMainForm();
@@ -314,7 +311,7 @@
frame.ButtonClickEvent += (sender, e) =>
{
//浣忓畢鎺ュ彛涓嶉渶瑕佺壒娈婄殑鐧婚檰Token
- var form = new Residence.ResidenceListForm();
+ var form = new Residence.ResidenceListMainForm();
form.AddForm();
};
}
@@ -398,28 +395,28 @@
{
frameOtherMenuContr = new FrameListControl(26);
frameOtherMenuContr.Y = Application.GetRealHeight(698);
- frameOtherMenuContr.Height = ControlCommonResourse.ListViewRowHeight * 4 + Application.GetRealHeight(26 * 4);
+ frameOtherMenuContr.Height = HdlControlResourse.ListViewRowHeight * 4 + Application.GetRealHeight(26 * 4);
frameWhite.AddChidren(frameOtherMenuContr);
}
- if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
+ if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1 || HdlUserCenterResourse.ResidenceOption.AuthorityNo == 2)
{
//鏁版嵁澶囦唤
var rowback = new FrameRowControl(frameOtherMenuContr.rowSpace / 2);
frameOtherMenuContr.AddChidren(rowback);
//鍚戝彸鍥炬爣
var btnBackRight = rowback.AddRightArrow();
- btnBackRight.X -= ControlCommonResourse.XXLeft / 2;
+ btnBackRight.X -= HdlControlResourse.XXLeft / 2;
//鍥炬爣
var btnBackIcon = rowback.AddLeftIcon();
- btnBackIcon.X -= ControlCommonResourse.XXLeft / 2;
+ btnBackIcon.X -= HdlControlResourse.XXLeft / 2;
btnBackIcon.UnSelectedImagePath = "Center/Backup.png";
//搴曠嚎
var btnBackLine = rowback.AddBottomLine();
- btnBackLine.X -= ControlCommonResourse.XXLeft / 2;
+ btnBackLine.X -= HdlControlResourse.XXLeft / 2;
//鏁版嵁澶囦唤View
var btnBackView = rowback.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uDataBackup), 300);
- btnBackView.X -= ControlCommonResourse.XXLeft / 2;
+ btnBackView.X -= HdlControlResourse.XXLeft / 2;
rowback.ButtonClickEvent += (sender, e) =>
{
if (Common.Config.Instance.Home.IsVirtually == true)
@@ -437,17 +434,17 @@
frameOtherMenuContr.AddChidren(rowSuggestion);
//鍚戝彸鍥炬爣
var btnSuRight = rowSuggestion.AddRightArrow();
- btnSuRight.X -= ControlCommonResourse.XXLeft / 2;
+ btnSuRight.X -= HdlControlResourse.XXLeft / 2;
//鍥炬爣
var btnSuggestionIcon = rowSuggestion.AddLeftIcon();
- btnSuggestionIcon.X -= ControlCommonResourse.XXLeft / 2;
+ btnSuggestionIcon.X -= HdlControlResourse.XXLeft / 2;
btnSuggestionIcon.UnSelectedImagePath = "Center/Opinion.png";
//搴曠嚎
var btnSuLine = rowSuggestion.AddBottomLine();
- btnSuLine.X -= ControlCommonResourse.XXLeft / 2;
+ btnSuLine.X -= HdlControlResourse.XXLeft / 2;
//鎰忚鍙嶉View
var btnSuView = rowSuggestion.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.Suggestions), 300);
- btnSuView.X -= ControlCommonResourse.XXLeft / 2;
+ btnSuView.X -= HdlControlResourse.XXLeft / 2;
rowSuggestion.ButtonClickEvent += (sender, e) =>
{
var form = new Suggestion.FeedbackForm();
@@ -459,17 +456,17 @@
frameOtherMenuContr.AddChidren(rowAbount);
//鍚戝彸鍥炬爣
var btnAbountRight = rowAbount.AddRightArrow();
- btnAbountRight.X -= ControlCommonResourse.XXLeft / 2;
+ btnAbountRight.X -= HdlControlResourse.XXLeft / 2;
//鍥炬爣
var btnAbountIcon = rowAbount.AddLeftIcon();
- btnAbountIcon.X -= ControlCommonResourse.XXLeft / 2;
+ btnAbountIcon.X -= HdlControlResourse.XXLeft / 2;
btnAbountIcon.UnSelectedImagePath = "Center/Abount.png";
//搴曠嚎
var btnAbountLine = rowAbount.AddBottomLine();
- btnAbountLine.X -= ControlCommonResourse.XXLeft / 2;
+ btnAbountLine.X -= HdlControlResourse.XXLeft / 2;
//鍏充簬鎴戜滑View
var btnAbountView = rowAbount.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uAboutMe), 300);
- btnAbountView.X -= ControlCommonResourse.XXLeft / 2;
+ btnAbountView.X -= HdlControlResourse.XXLeft / 2;
rowAbount.ButtonClickEvent += (sender, e) =>
{
if (Common.Config.Instance.Home.IsVirtually == true)
@@ -481,24 +478,24 @@
form.AddForm();
};
- if (UserCenterResourse.HideOption.CenterHideMenu == 1)
+ if (HdlUserCenterResourse.HideOption.CenterHideMenu == 1)
{
//闅愬尶鑿滃崟
var rowHide = new FrameRowControl(frameOtherMenuContr.rowSpace / 2);
frameOtherMenuContr.AddChidren(rowHide);
//鍚戝彸鍥炬爣
var btnHideRight = rowHide.AddRightArrow();
- btnHideRight.X -= ControlCommonResourse.XXLeft / 2;
+ btnHideRight.X -= HdlControlResourse.XXLeft / 2;
//鍥炬爣
var btnHideIcon = rowHide.AddLeftIcon();
- btnHideIcon.X -= ControlCommonResourse.XXLeft / 2;
+ btnHideIcon.X -= HdlControlResourse.XXLeft / 2;
btnHideIcon.UnSelectedImagePath = "Center/Abount.png";
//搴曠嚎
var btnHideLine = rowHide.AddBottomLine();
- btnHideLine.X -= ControlCommonResourse.XXLeft / 2;
+ btnHideLine.X -= HdlControlResourse.XXLeft / 2;
//闅愬尶鑿滃崟View
- var btnHideView = rowHide.AddLeftCaption("闅愬尶鑿滃崟", 300);
- btnHideView.X -= ControlCommonResourse.XXLeft / 2;
+ var btnHideView = rowHide.AddLeftCaption("璋冭瘯鑿滃崟", 300);
+ btnHideView.X -= HdlControlResourse.XXLeft / 2;
rowHide.ButtonClickEvent += (sender, e) =>
{
var from = new HideOption.HideOptionMainForm();
@@ -522,20 +519,17 @@
return -1;
}
//鐢ㄦ埛澶村儚
- if (UserCenterResourse.UserInfo.UserIconFileChanged == true)
+ if (HdlUserCenterResourse.UserInfo.UserIconFileChanged == true)
{
- UserCenterResourse.UserInfo.UserIconFileChanged = false;
- btnUserIcon.ImageBytes = Shared.IO.FileUtils.ReadFile(UserCenterResourse.UserInfo.UserIconFile);
+ HdlUserCenterResourse.UserInfo.UserIconFileChanged = false;
+ btnUserIcon.ImageBytes = Shared.IO.FileUtils.ReadFile(HdlFileNameResourse.UserHeadIconFile);
}
//鐢ㄦ埛鍚嶅瓧
- btnUserName.Text = UserCenterResourse.UserInfo.UserName;
- if (UserCenterResourse.UserInfo != null)
- {
- //鐢ㄦ埛韬唤
- btnAuthority.Text = UserCenterResourse.UserInfo.AuthorityText;
- }
+ btnUserName.Text = HdlUserCenterResourse.UserInfo.NickName;
+ //鐢ㄦ埛韬唤
+ btnAuthority.Text = HdlUserCenterResourse.ResidenceOption.AuthorityText;
//鐨囧啝
- if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
{
this.btnImperialCrown.Visible = false;
}
--
Gitblit v1.8.0