From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 220 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 126 insertions(+), 94 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index 0fb455a..8bd3b10 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -1,4 +1,6 @@
锘縰sing System;
+using System.Collections.Generic;
+using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using Shared;
@@ -17,11 +19,72 @@
LoadEvent_GoPersonalDataPage();
LoadEvent_SkipAboutOnPage();
LoadEvent_SkipGetSupportPage();
- if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
LoadEvent_SkipResdentialManagePage();
LoadEvent_GoMemberManagement();
LoadEvent_SkipbtnAddFunctionPage();
+ LoadEvent_SkipSmartSpeakerPage();
+ }
+ if(DB_ResidenceData.Instance.GatewayType == 1)
+ {
+ LoadEvent_SecurityEvent();
+ }
+ }
+
+ /// <summary>
+ /// 瀹夐槻閮ㄥ垎浜嬩欢
+ /// </summary>
+ void LoadEvent_SecurityEvent()
+ {
+ if (btnResidenceArmIcon != null)
+ {
+ btnResidenceArmIcon.IsSelected = false;
+ lock (FunctionList.List.securities)
+ {
+ foreach (var temp in FunctionList.List.securities)
+ {
+ if (temp.status == "enable")
+ {
+ if (temp.alarm)
+ {
+ btnResidenceArmIcon.SelectedImagePath = "PersonalCenter/ResidenceInAlarmIcon.png";
+ }
+ else
+ {
+ btnResidenceArmIcon.SelectedImagePath = "PersonalCenter/ResidenceDefenseIcon.png";
+ }
+ btnResidenceArmIcon.IsSelected = true;
+ break;
+ }
+ }
+ }
+ btnResidenceArmIcon.MouseUpEventHandler = (sender, e) =>
+ {
+ var page = new ArmCenterPage();
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ }
+ if (btnResidenceArmText != null)
+ {
+ btnResidenceArmText.TextID = StringId.Undefense;
+ foreach (var temp in FunctionList.List.securities)
+ {
+ if (temp.status == "enable")
+ {
+ btnResidenceArmText.TextID = StringId.Defense;
+ break;
+ }
+ }
+ btnResidenceArmText.MouseUpEventHandler = (sender, e) =>
+ {
+ var page = new ArmCenterPage();
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
}
}
@@ -61,8 +124,24 @@
};
dispalyView.AddChidren(contentView);
- if (UserInfo.Current.regionList.Count < 3)
+ if (UserInfo.Current.regionList.Count < 2)
{
+
+ }
+ 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)
{
@@ -118,15 +197,15 @@
var btnHomeName = new Button()
{
Width = Application.GetRealWidth(112),
- Height = Application.GetRealHeight(44),
+ Height = Application.GetRealHeight(40),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS.CSS_Color.FirstLevelTitleColor,
SelectedTextColor = CSS.CSS_Color.MainColor,
- Text = home.Name,
- TextSize = home.Name.Length > 14 ? CSS.CSS_FontSize.TextFontSize : CSS.CSS_FontSize.SubheadingFontSize,
- IsSelected = DB_ResidenceData.residenceData.residecenInfo.RegionID == home.RegionID,
+ Text = home.homeName,
+ TextSize = home.homeName.Length > 14 ? CSS.CSS_FontSize.TextFontSize : CSS.CSS_FontSize.SubheadingFontSize,
+ IsSelected = DB_ResidenceData.Instance.CurrentRegion.id == home.id,
IsMoreLines = true,
- Tag = home.RegionID
+ Tag = home.id
};
contentView.AddChidren(btnHomeName);
@@ -144,8 +223,7 @@
{
var regionId = (string)btnHomeName.Tag;
dialog.Close();
- //DB_ResidenceData.residenceData.CurReginID = regionId;
- LoadEvent_ChangeCurHome(UserInfo.Current.regionList.Find((obj) => obj.RegionID == regionId));
+ LoadEvent_ChangeCurHome(home);
LoadContentView();
};
}
@@ -161,96 +239,29 @@
/// <param name="homeTemp"></param>
void LoadEvent_ChangeCurHome(RegionInfoRes homeTemp)
{
- if (DB_ResidenceData.residenceData.CurReginID == homeTemp.RegionID)
+ if (DB_ResidenceData.Instance.CurrentRegion.id == homeTemp.id)
{
return;
}
- string oldRegionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID.ToString());
- string newRegionRootPath = FileUtils.CreateRegionBackup(homeTemp.RegionID.ToString());
- DB_ResidenceData.residenceData.CurReginID = homeTemp.RegionID;
- DB_ResidenceData.residenceData.SaveResidenceData();
- var waitPage = new Loading();
- new System.Threading.Thread(() =>
- {
- try
- {
- var backuplist = FileUtils.ReadFiles();
- int index = 0;
- FileUtils.DeleteRegionFiles(oldRegionRootPath);
- //绉诲姩鏂囦欢
- foreach (var fileName in backuplist)
- {
- System.IO.FileInfo fileInfo = new System.IO.FileInfo(FileUtils.RootPath + fileName);
- if (fileName == "headImage.png")
- {
- continue;
- }
- if (fileInfo.Exists)
- {
- fileInfo.MoveTo(oldRegionRootPath + fileName);
- MainPage.Log("move file : " + fileName);
- }
- index++;
- Application.RunOnMainThread(() =>
- {
- int pro = (int)(index * 1.0 / backuplist.Count * 50);
- waitPage.Text = pro.ToString() + "%";
- });
- }
- //鍒犻櫎鏈湴鏂囦欢
- foreach (var fileName in backuplist)
- {
- if (fileName == "headImage.png")
- {
- continue;
- }
- FileUtils.DeleteFile(fileName);
- }
- //鍊掑嚭鏂颁綇瀹呮暟鎹�
- FileUtils.RestoreRegionFiles(newRegionRootPath);
- UserInfo.Current.SaveUserInfo();
- DB_ResidenceData.residenceData.EixtAccount();
- DB_ResidenceData.residenceData.CurReginID = homeTemp.RegionID;
- OnAppConfig.Instance.SaveUserConfig();
- DB_ResidenceData.InitRoomFunction();
- DB_ResidenceData.residenceData.SaveResidenceData();
- Application.RunOnMainThread(() =>
- {
- btnCurResidenceName.Text = DB_ResidenceData.residenceData.residecenInfo.Name;
- });
- }
- catch (Exception ex)
- {
- Application.RunOnMainThread(() =>
- {
- new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.OperationFailed),
- Language.StringByID(StringId.Close)).Show();
- });
- MainPage.Log(ex.Message);
- }
- finally
- {
- Application.RunOnMainThread(() =>
- {
- waitPage.Hide();
- waitPage.RemoveFromParent();
- });
- }
- })
- { IsBackground = true }.Start();
+ DB_ResidenceData.Instance.CurrentRegion = homeTemp;
+ DB_ResidenceData.Instance.SaveResidenceData();
+ btnCurResidenceName.Text = DB_ResidenceData.Instance.CurrentRegion.homeName;
+ DB_ResidenceData.Instance.EixtAccount();
+ //鍒锋柊浣忓畢鏁版嵁
+ Common.ApiUtlis.Ins.DownloadData();
}
#endregion
#region 浣忓畢绠＄悊
void LoadEvent_SkipResdentialManagePage()
{
- if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
Action updateResidenceName = () =>
{
- btnCurResidenceName.Text = DB_ResidenceData.residenceData.residecenInfo.Name;
+ btnCurResidenceName.Text = DB_ResidenceData.Instance.CurrentRegion.homeName;
};
var residentialManagePage = new ResidentialManagePage(updateResidenceName);
MainPage.BasePageView.AddChidren(residentialManagePage);
@@ -308,15 +319,22 @@
#region 娣诲姞璁惧
void LoadEvent_SkipbtnAddFunctionPage()
{
- EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+ if (DB_ResidenceData.Instance.GatewayType == 1)
{
- var page = new SearchDevicePage();
- MainPage.BasePageView.AddChidren(page);
- page.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
- btnResidenceAddFunctionIcon.MouseUpEventHandler = eventHandler;
- btnResidenceAddFunctionText.MouseUpEventHandler = eventHandler;
+ try
+ {
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+ {
+ var page = new BrandListPage();
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ btnResidenceAddFunctionIcon.MouseUpEventHandler = eventHandler;
+ btnResidenceAddFunctionText.MouseUpEventHandler = eventHandler;
+ }
+ catch { }
+ }
}
#endregion
@@ -341,12 +359,26 @@
{
btnSupportText.MouseUpEventHandler = (sender, e) =>
{
- var getsupportPage = new GetSupportPage();
+ var getsupportPage = new FAQHelpPage();
MainPage.BasePageView.AddChidren(getsupportPage);
getsupportPage.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
}
+
+ /// <summary>
+ /// 璺宠浆鏅鸿兘闊崇椤甸潰
+ /// </summary>
+ void LoadEvent_SkipSmartSpeakerPage()
+ {
+ btnSmartSpeakerText.MouseUpEventHandler = (sender, e) =>
+ {
+ var page = new SmartSpeakerListPage();
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ }
#endregion
--
Gitblit v1.8.0