From 145b157ba183ebf877c93ed2dbb01ec737c993d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 08 十二月 2020 18:59:33 +0800
Subject: [PATCH] Merge branch 'WJC'
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 80 +++++++++++++++++++++++++++++++---------
1 files changed, 62 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index 1873f67..5d72c0e 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using Shared;
@@ -20,10 +21,8 @@
if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
{
LoadEvent_SkipResdentialManagePage();
- }
- if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
- {
LoadEvent_GoMemberManagement();
+ LoadEvent_SkipbtnAddFunctionPage();
}
}
@@ -33,7 +32,6 @@
/// </summary>
void LoadEvent_SwitchHome()
{
-
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
var dialog = new Dialog();
@@ -64,10 +62,26 @@
};
dispalyView.AddChidren(contentView);
- if (MainPage.LoginUser.regionList.Count < 3)
+ if (UserInfo.Current.regionList.Count < 2)
{
+
}
- else if (MainPage.LoginUser.regionList.Count < 4)
+ else if (UserInfo.Current.regionList.Count < 3)
+ {
+ dispalyView = new FrameLayout()
+ {
+ X = Application.GetRealWidth(10),
+ Y = Application.GetRealHeight(268),
+ Width = Application.GetRealWidth(160),
+ Height = Application.GetRealHeight(105),
+ BackgroundImagePath = "PersonalCenter/HomeList1bg.png",
+ };
+ dialogBody.AddChidren(dispalyView);
+
+ contentView.Height = Application.GetRealHeight(45 * 2);
+ dispalyView.AddChidren(contentView);
+ }
+ else if (UserInfo.Current.regionList.Count < 4)
{
dispalyView = new FrameLayout()
{
@@ -82,7 +96,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 +130,7 @@
- foreach (var home in MainPage.LoginUser.regionList)
+ foreach (var home in UserInfo.Current.regionList)
{
var btnHomeName = new Button()
{
@@ -133,7 +147,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 +162,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();
};
}
@@ -173,6 +187,8 @@
DB_ResidenceData.residenceData.CurReginID = homeTemp.RegionID;
DB_ResidenceData.residenceData.SaveResidenceData();
var waitPage = new Loading();
+ bodyView.AddChidren(waitPage);
+ waitPage.Start(Language.StringByID(StringId.PleaseWait));
new System.Threading.Thread(() =>
{
try
@@ -184,7 +200,7 @@
foreach (var fileName in backuplist)
{
System.IO.FileInfo fileInfo = new System.IO.FileInfo(FileUtils.RootPath + fileName);
- if (fileName == "headImage.png")
+ if (fileName.Contains(ImageUtlis.HEADIMAGE) || fileName == OnAppConfig.ConfigFile)
{
continue;
}
@@ -203,7 +219,7 @@
//鍒犻櫎鏈湴鏂囦欢
foreach (var fileName in backuplist)
{
- if (fileName == "headImage.png")
+ if (fileName.Contains(ImageUtlis.HEADIMAGE))
{
continue;
}
@@ -211,16 +227,22 @@
}
//鍊掑嚭鏂颁綇瀹呮暟鎹�
FileUtils.RestoreRegionFiles(newRegionRootPath);
- MainPage.LoginUser.SaveUserInfo();
+ UserInfo.Current.SaveUserInfo();
DB_ResidenceData.residenceData.EixtAccount();
DB_ResidenceData.residenceData.CurReginID = homeTemp.RegionID;
OnAppConfig.Instance.SaveUserConfig();
- DB_ResidenceData.InitRoomFunction();
+ SpatialInfo.CurrentSpatial.InitRoomFunction();
DB_ResidenceData.residenceData.SaveResidenceData();
+ //鍒锋柊涓�娆′綇瀹呯綉鍏�
+ new HttpServerRequest().GetHomeGatewayList();
+
Application.RunOnMainThread(() =>
{
btnCurResidenceName.Text = DB_ResidenceData.residenceData.residecenInfo.Name;
});
+
+ //鎼滅储缃戝叧
+ DriverLayer.Control.Ins.SearchLoaclGateway();
}
catch (Exception ex)
{
@@ -237,6 +259,7 @@
{
waitPage.Hide();
waitPage.RemoveFromParent();
+ MainPage.InitializationData();
});
}
})
@@ -273,11 +296,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 +318,8 @@
#region 鎴愬憳绠＄悊
void LoadEvent_GoMemberManagement()
{
- EventHandler<MouseEventArgs> eHandler = (sender, e) => {
+ EventHandler<MouseEventArgs> eHandler = (sender, e) =>
+ {
var mmp = new MemberManagementPage();
MainPage.BasePageView.AddChidren(mmp);
mmp.LoadPage();
@@ -307,6 +331,20 @@
#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>
@@ -329,7 +367,13 @@
{
btnSupportText.MouseUpEventHandler = (sender, e) =>
{
- var getsupportPage = new GetSupportPage();
+ //var getsupportPage = new GetSupportPage();
+ //MainPage.BasePageView.AddChidren(getsupportPage);
+ //getsupportPage.LoadPage();
+ //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+
+
+ var getsupportPage = new FAQHelpPage();
MainPage.BasePageView.AddChidren(getsupportPage);
getsupportPage.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
--
Gitblit v1.8.0