From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs | 85 +++++++++++++++++++++---------------------
1 files changed, 43 insertions(+), 42 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
index 34e157d..b4ace58 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
@@ -80,7 +80,7 @@
//涓汉涓績
var btnTitle = new NormalViewControl(450, 100, true);
- btnTitle.X = HdlControlResourse.XXLeft;
+ btnTitle.X = ControlCommonResourse.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(HdlFileNameResourse.UserHeadIconFile);
+ btnUserIcon.ImageBytes = Shared.IO.FileUtils.ReadFile(UserCenterResourse.UserInfo.UserIconFile);
}
else
{
@@ -158,7 +158,7 @@
this.ShowMassage(ShowMsgType.Confirm, msg, () =>
{
//閫�鍑鸿处鍙�
- HdlAccountLogic.Current.ReLoginAgain(Common.Config.Instance.Account);
+ UserCenterLogic.ReLoginAgain(Common.Config.Instance.Account);
});
return;
}
@@ -172,7 +172,7 @@
btnImperialCrown.Y = Application.GetRealHeight(475);
btnImperialCrown.UnSelectedImagePath = "Center/ImperialCrown.png";
bodyFrameLayout.AddChidren(btnImperialCrown);
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
+ if (UserCenterResourse.UserInfo.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 (HdlUserCenterResourse.UserInfo != null)
+ if (UserCenterResourse.UserInfo != null)
{
- btnUserName.Text = HdlUserCenterResourse.UserInfo.NickName;
+ btnUserName.Text = UserCenterResourse.UserInfo.UserName;
}
frameWhite.AddChidren(btnUserName);
@@ -194,7 +194,10 @@
btnAuthority.Y = btnUserName.Bottom;
btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor3;
btnAuthority.TextSize = 12;
- btnAuthority.Text = HdlUserCenterResourse.ResidenceOption.AuthorityText;
+ if (UserCenterResourse.UserInfo != null)
+ {
+ btnAuthority.Text = UserCenterResourse.UserInfo.AuthorityText;
+ }
frameWhite.AddChidren(btnAuthority);
}
@@ -259,7 +262,7 @@
//鎴愬憳绠＄悊
string unSelectPic = "Center/MenberManagement.png";
int TextID = R.MyInternationalizationString.uMember;
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1 || HdlUserCenterResourse.ResidenceOption.AuthorityNo == 2)
+ if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
{
//鐢熸垚鎺т欢
var frame = this.CreatMainMenuControl(frameMenu, TextID, unSelectPic);
@@ -278,7 +281,7 @@
//璁惧绠＄悊
unSelectPic = "Center/DeviceManagement.png";
TextID = R.MyInternationalizationString.uDevice;
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1 || HdlUserCenterResourse.ResidenceOption.AuthorityNo == 2)
+ if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
{
//鐢熸垚鎺т欢
var frame = this.CreatMainMenuControl(frameMenu, TextID, unSelectPic);
@@ -286,7 +289,7 @@
{
HdlGatewayLogic.Current.RefreshAppOldSelectGatewayId();
//鎷ユ湁缃戝叧,鎴栬�呮槸铏氭嫙浣忓畢,鍒欒繘鍏ヨ澶囧垪琛ㄧ晫闈�
- if (string.IsNullOrEmpty(HdlGatewayResourse.AppOldSelectGatewayId) == false
+ if (string.IsNullOrEmpty(GatewayResourse.AppOldSelectGatewayId) == false
|| Common.Config.Instance.Home.IsVirtually == true)
{
var form = new Device.DeviceListMainForm();
@@ -395,28 +398,28 @@
{
frameOtherMenuContr = new FrameListControl(26);
frameOtherMenuContr.Y = Application.GetRealHeight(698);
- frameOtherMenuContr.Height = HdlControlResourse.ListViewRowHeight * 4 + Application.GetRealHeight(26 * 4);
+ frameOtherMenuContr.Height = ControlCommonResourse.ListViewRowHeight * 4 + Application.GetRealHeight(26 * 4);
frameWhite.AddChidren(frameOtherMenuContr);
}
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1 || HdlUserCenterResourse.ResidenceOption.AuthorityNo == 2)
+ if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
{
//鏁版嵁澶囦唤
var rowback = new FrameRowControl(frameOtherMenuContr.rowSpace / 2);
frameOtherMenuContr.AddChidren(rowback);
//鍚戝彸鍥炬爣
var btnBackRight = rowback.AddRightArrow();
- btnBackRight.X -= HdlControlResourse.XXLeft / 2;
+ btnBackRight.X -= ControlCommonResourse.XXLeft / 2;
//鍥炬爣
var btnBackIcon = rowback.AddLeftIcon();
- btnBackIcon.X -= HdlControlResourse.XXLeft / 2;
+ btnBackIcon.X -= ControlCommonResourse.XXLeft / 2;
btnBackIcon.UnSelectedImagePath = "Center/Backup.png";
//搴曠嚎
var btnBackLine = rowback.AddBottomLine();
- btnBackLine.X -= HdlControlResourse.XXLeft / 2;
+ btnBackLine.X -= ControlCommonResourse.XXLeft / 2;
//鏁版嵁澶囦唤View
var btnBackView = rowback.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uDataBackup), 300);
- btnBackView.X -= HdlControlResourse.XXLeft / 2;
+ btnBackView.X -= ControlCommonResourse.XXLeft / 2;
rowback.ButtonClickEvent += (sender, e) =>
{
if (Common.Config.Instance.Home.IsVirtually == true)
@@ -434,17 +437,17 @@
frameOtherMenuContr.AddChidren(rowSuggestion);
//鍚戝彸鍥炬爣
var btnSuRight = rowSuggestion.AddRightArrow();
- btnSuRight.X -= HdlControlResourse.XXLeft / 2;
+ btnSuRight.X -= ControlCommonResourse.XXLeft / 2;
//鍥炬爣
var btnSuggestionIcon = rowSuggestion.AddLeftIcon();
- btnSuggestionIcon.X -= HdlControlResourse.XXLeft / 2;
+ btnSuggestionIcon.X -= ControlCommonResourse.XXLeft / 2;
btnSuggestionIcon.UnSelectedImagePath = "Center/Opinion.png";
//搴曠嚎
var btnSuLine = rowSuggestion.AddBottomLine();
- btnSuLine.X -= HdlControlResourse.XXLeft / 2;
+ btnSuLine.X -= ControlCommonResourse.XXLeft / 2;
//鎰忚鍙嶉View
var btnSuView = rowSuggestion.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.Suggestions), 300);
- btnSuView.X -= HdlControlResourse.XXLeft / 2;
+ btnSuView.X -= ControlCommonResourse.XXLeft / 2;
rowSuggestion.ButtonClickEvent += (sender, e) =>
{
var form = new Suggestion.FeedbackForm();
@@ -456,46 +459,41 @@
frameOtherMenuContr.AddChidren(rowAbount);
//鍚戝彸鍥炬爣
var btnAbountRight = rowAbount.AddRightArrow();
- btnAbountRight.X -= HdlControlResourse.XXLeft / 2;
+ btnAbountRight.X -= ControlCommonResourse.XXLeft / 2;
//鍥炬爣
var btnAbountIcon = rowAbount.AddLeftIcon();
- btnAbountIcon.X -= HdlControlResourse.XXLeft / 2;
+ btnAbountIcon.X -= ControlCommonResourse.XXLeft / 2;
btnAbountIcon.UnSelectedImagePath = "Center/Abount.png";
//搴曠嚎
var btnAbountLine = rowAbount.AddBottomLine();
- btnAbountLine.X -= HdlControlResourse.XXLeft / 2;
+ btnAbountLine.X -= ControlCommonResourse.XXLeft / 2;
//鍏充簬鎴戜滑View
var btnAbountView = rowAbount.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uAboutMe), 300);
- btnAbountView.X -= HdlControlResourse.XXLeft / 2;
+ btnAbountView.X -= ControlCommonResourse.XXLeft / 2;
rowAbount.ButtonClickEvent += (sender, e) =>
{
- if (Common.Config.Instance.Home.IsVirtually == true)
- {
- //濡傛灉浣忓畢涓鸿櫄鎷熶綇瀹�,鍒欐鍔熻兘鏃犳晥
- return;
- }
var form = new Abount.AbountForm();
form.AddForm();
};
- if (HdlUserCenterResourse.HideOption.CenterHideMenu == 1)
+ if (UserCenterResourse.HideOption.CenterHideMenu == 1)
{
//闅愬尶鑿滃崟
var rowHide = new FrameRowControl(frameOtherMenuContr.rowSpace / 2);
frameOtherMenuContr.AddChidren(rowHide);
//鍚戝彸鍥炬爣
var btnHideRight = rowHide.AddRightArrow();
- btnHideRight.X -= HdlControlResourse.XXLeft / 2;
+ btnHideRight.X -= ControlCommonResourse.XXLeft / 2;
//鍥炬爣
var btnHideIcon = rowHide.AddLeftIcon();
- btnHideIcon.X -= HdlControlResourse.XXLeft / 2;
+ btnHideIcon.X -= ControlCommonResourse.XXLeft / 2;
btnHideIcon.UnSelectedImagePath = "Center/Abount.png";
//搴曠嚎
var btnHideLine = rowHide.AddBottomLine();
- btnHideLine.X -= HdlControlResourse.XXLeft / 2;
+ btnHideLine.X -= ControlCommonResourse.XXLeft / 2;
//闅愬尶鑿滃崟View
- var btnHideView = rowHide.AddLeftCaption("璋冭瘯鑿滃崟", 300);
- btnHideView.X -= HdlControlResourse.XXLeft / 2;
+ var btnHideView = rowHide.AddLeftCaption("闅愬尶鑿滃崟", 300);
+ btnHideView.X -= ControlCommonResourse.XXLeft / 2;
rowHide.ButtonClickEvent += (sender, e) =>
{
var from = new HideOption.HideOptionMainForm();
@@ -519,17 +517,20 @@
return -1;
}
//鐢ㄦ埛澶村儚
- if (HdlUserCenterResourse.UserInfo.UserIconFileChanged == true)
+ if (UserCenterResourse.UserInfo.UserIconFileChanged == true)
{
- HdlUserCenterResourse.UserInfo.UserIconFileChanged = false;
- btnUserIcon.ImageBytes = Shared.IO.FileUtils.ReadFile(HdlFileNameResourse.UserHeadIconFile);
+ UserCenterResourse.UserInfo.UserIconFileChanged = false;
+ btnUserIcon.ImageBytes = Shared.IO.FileUtils.ReadFile(UserCenterResourse.UserInfo.UserIconFile);
}
//鐢ㄦ埛鍚嶅瓧
- btnUserName.Text = HdlUserCenterResourse.UserInfo.NickName;
- //鐢ㄦ埛韬唤
- btnAuthority.Text = HdlUserCenterResourse.ResidenceOption.AuthorityText;
+ btnUserName.Text = UserCenterResourse.UserInfo.UserName;
+ if (UserCenterResourse.UserInfo != null)
+ {
+ //鐢ㄦ埛韬唤
+ btnAuthority.Text = UserCenterResourse.UserInfo.AuthorityText;
+ }
//鐨囧啝
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
{
this.btnImperialCrown.Visible = false;
}
--
Gitblit v1.8.0