From e87985ec1dcb69beedaf9f95e8e7aba14b7c08d6 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 09 十二月 2020 18:50:14 +0800
Subject: [PATCH] 2020-12-09 1.信息中心，增加下划线和点击Alter提醒详情。
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 140 ++++++++++++++++++++++++++++++++++------------
1 files changed, 103 insertions(+), 37 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index 599a367..4cdd3c0 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;
@@ -15,13 +16,13 @@
{
LoadEvent_SwitchHome();
LoadEvent_GoPersonalDataPage();
+ LoadEvent_SkipAboutOnPage();
+ LoadEvent_SkipGetSupportPage();
if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
{
LoadEvent_SkipResdentialManagePage();
- }
- if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
- {
LoadEvent_GoMemberManagement();
+ LoadEvent_SkipbtnAddFunctionPage();
}
}
@@ -31,16 +32,13 @@
/// </summary>
void LoadEvent_SwitchHome()
{
-
- btnAboutOnText.MouseUpEventHandler = (sender, e) => {
- DAL.Net.Mqtt_Cloud.StartCloudMqtt();
- };
-
- EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+ {
var dialog = new Dialog();
var dialogBody = new FrameLayout();
dialog.AddChidren(dialogBody);
- dialogBody.MouseUpEventHandler = (sender1, e1) => {
+ dialogBody.MouseUpEventHandler = (sender1, e1) =>
+ {
dialog.Close();
};
@@ -59,15 +57,31 @@
X = Application.GetRealWidth(22),
Y = Application.GetRealHeight(15),
Width = Application.GetRealWidth(150),
- Height = Application.GetRealHeight(45 ),
+ Height = Application.GetRealHeight(45),
ScrollEnabled = false
};
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()
{
@@ -147,8 +161,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 +186,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 +199,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 +218,7 @@
//鍒犻櫎鏈湴鏂囦欢
foreach (var fileName in backuplist)
{
- if (fileName == "headImage.png")
+ if (fileName.Contains(ImageUtlis.HEADIMAGE))
{
continue;
}
@@ -211,16 +226,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 +258,7 @@
{
waitPage.Hide();
waitPage.RemoveFromParent();
+ MainPage.InitializationData();
});
}
})
@@ -251,7 +273,8 @@
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- Action updateResidenceName = () => {
+ Action updateResidenceName = () =>
+ {
btnCurResidenceName.Text = DB_ResidenceData.residenceData.residecenInfo.Name;
};
var residentialManagePage = new ResidentialManagePage(updateResidenceName);
@@ -272,11 +295,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);
@@ -294,17 +317,8 @@
#region 鎴愬憳绠＄悊
void LoadEvent_GoMemberManagement()
{
-
- EventHandler<MouseEventArgs> eHandler = (sender, e) => {
- //};
- //residenceMemberView.MouseUpEventHandler = (sender, e) => {
- //Action updataHeadImage = () => {
- // userHeadImageView.ImagePath = MainPage.LoginUser.headImagePagePath;
- //};
- //Action updataUserName = () => {
- // btnUserName.Text = MainPage.LoginUser.userName;
- //};
-
+ EventHandler<MouseEventArgs> eHandler = (sender, e) =>
+ {
var mmp = new MemberManagementPage();
MainPage.BasePageView.AddChidren(mmp);
mmp.LoadPage();
@@ -315,5 +329,57 @@
}
#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>
+ /// 璺宠浆鑷冲叧浜嶰n椤甸潰
+ /// </summary>
+ void LoadEvent_SkipAboutOnPage()
+ {
+ btnAboutOnText.MouseUpEventHandler = (sender, e) =>
+ {
+ var aboutOnPage = new AboutOnPage();
+ MainPage.BasePageView.AddChidren(aboutOnPage);
+ aboutOnPage.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ }
+ /// <summary>
+ /// 璺宠浆鑷宠幏鍙栨敮鎸侀〉闈�
+ /// </summary>
+ void LoadEvent_SkipGetSupportPage()
+ {
+ btnSupportText.MouseUpEventHandler = (sender, e) =>
+ {
+ //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;
+ };
+ }
+ #endregion
+
+
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0