From 716d1b3b705e7d37e6edebd7f60b7613ab5aee87 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 20 十一月 2020 18:46:22 +0800
Subject: [PATCH] 1120-3
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index 163a907..f6d7949 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -20,10 +20,8 @@
if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
{
LoadEvent_SkipResdentialManagePage();
- }
- if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
- {
LoadEvent_GoMemberManagement();
+ LoadEvent_SkipbtnAddFunctionPage();
}
}
@@ -33,7 +31,6 @@
/// </summary>
void LoadEvent_SwitchHome()
{
-
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
var dialog = new Dialog();
@@ -64,10 +61,10 @@
};
dispalyView.AddChidren(contentView);
- if (MainPage.LoginUser.regionList.Count < 3)
+ if ( UserInfo.Current.regionList.Count < 3)
{
}
- else if (MainPage.LoginUser.regionList.Count < 4)
+ else if ( UserInfo.Current.regionList.Count < 4)
{
dispalyView = new FrameLayout()
{
@@ -82,7 +79,7 @@
contentView.Height = Application.GetRealHeight(45 * 3);
dispalyView.AddChidren(contentView);
}
- else if (MainPage.LoginUser.regionList.Count < 5)
+ else if ( UserInfo.Current.regionList.Count < 5)
{
dispalyView = new FrameLayout()
{
@@ -116,7 +113,7 @@
- foreach (var home in MainPage.LoginUser.regionList)
+ foreach (var home in UserInfo.Current.regionList)
{
var btnHomeName = new Button()
{
@@ -133,7 +130,7 @@
};
contentView.AddChidren(btnHomeName);
- if (MainPage.LoginUser.regionList.IndexOf(home) < MainPage.LoginUser.regionList.Count - 1)
+ if ( UserInfo.Current.regionList.IndexOf(home) < UserInfo.Current.regionList.Count - 1)
{
contentView.AddChidren(new Button()
{
@@ -148,7 +145,7 @@
var regionId = (string)btnHomeName.Tag;
dialog.Close();
//DB_ResidenceData.residenceData.CurReginID = regionId;
- LoadEvent_ChangeCurHome(MainPage.LoginUser.regionList.Find((obj) => obj.RegionID == regionId));
+ LoadEvent_ChangeCurHome( UserInfo.Current.regionList.Find((obj) => obj.RegionID == regionId));
LoadContentView();
};
}
@@ -211,7 +208,7 @@
}
//鍊掑嚭鏂颁綇瀹呮暟鎹�
FileUtils.RestoreRegionFiles(newRegionRootPath);
- MainPage.LoginUser.SaveUserInfo();
+ UserInfo.Current.SaveUserInfo();
DB_ResidenceData.residenceData.EixtAccount();
DB_ResidenceData.residenceData.CurReginID = homeTemp.RegionID;
OnAppConfig.Instance.SaveUserConfig();
@@ -273,11 +270,11 @@
{
Action updataHeadImage = () =>
{
- userHeadImageView.ImagePath = MainPage.LoginUser.headImagePagePath;
+ userHeadImageView.ImagePath = UserInfo.Current.headImagePagePath;
};
Action updataUserName = () =>
{
- btnUserName.Text = MainPage.LoginUser.userName;
+ btnUserName.Text = UserInfo.Current.userName;
};
var personalDataView = new PersonalDataPage(updataHeadImage, updataUserName);
@@ -295,7 +292,6 @@
#region 鎴愬憳绠＄悊
void LoadEvent_GoMemberManagement()
{
-#if stage2
EventHandler<MouseEventArgs> eHandler = (sender, e) => {
var mmp = new MemberManagementPage();
MainPage.BasePageView.AddChidren(mmp);
@@ -304,11 +300,23 @@
};
btnResidenceMemberIcon.MouseUpEventHandler = eHandler;
btnResidenceMemberText.MouseUpEventHandler = eHandler;
-#endif
}
#endregion
+ #region 娣诲姞璁惧
+ void LoadEvent_SkipbtnAddFunctionPage()
+ {
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
+ var page = new SearchDevicePage();
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ btnResidenceAddFunctionIcon.MouseUpEventHandler = eventHandler;
+ btnResidenceAddFunctionText.MouseUpEventHandler = eventHandler;
+ }
+ #endregion
#region 鍏充簬On銆佽幏鍙栨敮鎸�
/// <summary>
--
Gitblit v1.8.0