From 5eeafe3af80bfd88306bd8ad9e76c8f4b51ca35f Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 14:16:20 +0800
Subject: [PATCH] 增加本地发送的重发机制
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 257 ++++++++++++++++++++++----------------------------
1 files changed, 114 insertions(+), 143 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index d53ebbd..331e653 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,15 @@
{
LoadEvent_SwitchHome();
LoadEvent_GoPersonalDataPage();
- if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
+ LoadEvent_SkipAboutOnPage();
+ LoadEvent_SkipGetSupportPage();
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
{
LoadEvent_SkipResdentialManagePage();
- }
- if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
- {
LoadEvent_GoMemberManagement();
+ #region F3闃舵
+ //LoadEvent_SkipbtnAddFunctionPage();
+ #endregion
}
}
@@ -31,80 +34,13 @@
/// </summary>
void LoadEvent_SwitchHome()
{
-#if DEBUG
- btnUserTypeName.MouseUpEventHandler = (sender, e) =>
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- var pm = new DAL.Server.HttpServerRequest();
- var iddd = pm.GetRegionLastBackupId();
- Dialog dialog = new Dialog();
-
- FrameLayout bodyView = new FrameLayout();
- dialog.AddChidren(bodyView);
- bodyView.MouseUpEventHandler = (sender3, e3) => {
- dialog.Close();
- };
-
- FrameLayout frame = new FrameLayout()
- {
- Gravity = Gravity.Center,
- Width = Application.GetRealWidth(280),
- Height =Application.GetRealHeight(300),
- BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealWidth(16),
- };
- dialog.AddChidren(frame);
-
- Button btnTitleDialog = new Button()
- {
- Height = Application.GetRealHeight(60),
- TextAlignment = TextAlignment.Center,
- Text = "鏁版嵁鎭㈠",
- TextSize = CSS.CSS_FontSize.SubheadingFontSize,
- TextColor = CSS.CSS_Color.SecondLevelTitleColor,
- BackgroundColor = CSS.CSS_Color.PromptingColor2,
- };
- frame.AddChidren(btnTitleDialog);
-
- VerticalScrolViewLayout view = new VerticalScrolViewLayout()
- {
- Y = Application.GetRealHeight(60),
- Height = Application.GetRealHeight(240),
- };
- frame.AddChidren(view);
-
- foreach(var dd in iddd)
- {
- Button btn = new Button()
- {
- Height = Application.GetRealHeight(50),
- TextAlignment = TextAlignment.Center,
- TextSize = CSS.CSS_FontSize.TextFontSize,
- TextColor = CSS.CSS_Color.TextualColor,
- Text = dd.Value,
- };
- view.AddChidren(btn);
-
- btn.MouseUpEventHandler = (sender1, e1) =>
- {
- dialog.Close();
- pm.GetBackupFileList(dd.Key);
- };
-
- view.AddChidren(new Button()
- {
- Gravity = Gravity.CenterHorizontal,
- Height = Application.GetRealHeight(1),
- BackgroundColor = CSS.CSS_Color.BackgroundColor
- });
- }
- dialog.Show();
- };
-#endif
- 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();
};
@@ -123,15 +59,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()
{
@@ -146,7 +98,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()
{
@@ -180,7 +132,7 @@
- foreach (var home in MainPage.LoginUser.regionList)
+ foreach (var home in UserInfo.Current.regionList)
{
var btnHomeName = new Button()
{
@@ -191,13 +143,13 @@
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,
+ IsSelected = DB_ResidenceData.Instance.CurrentRegion.RegionID == home.RegionID,
IsMoreLines = true,
Tag = home.RegionID
};
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()
{
@@ -211,7 +163,8 @@
{
var regionId = (string)btnHomeName.Tag;
dialog.Close();
- LoadEvent_ChangeCurHome(MainPage.LoginUser.regionList.Find((obj) => obj.RegionID == regionId));
+ //LoadEvent_ChangeCurHome(UserInfo.Current.regionList.Find((obj) => obj.RegionID == regionId));
+ LoadEvent_ChangeCurHome(home);
LoadContentView();
};
}
@@ -227,61 +180,32 @@
/// <param name="homeTemp"></param>
void LoadEvent_ChangeCurHome(RegionInfoRes homeTemp)
{
- if (DB_ResidenceData.residenceData.CurReginID == homeTemp.RegionID)
+ if (DB_ResidenceData.Instance.CurrentRegion.RegionID == homeTemp.RegionID)
{
return;
}
+ DB_ResidenceData.Instance.CurrentRegion = homeTemp;
+ DB_ResidenceData.Instance.SaveResidenceData();
var waitPage = new Loading();
+ bodyView.AddChidren(waitPage);
+ waitPage.Start(Language.StringByID(StringId.PleaseWait));
new System.Threading.Thread(() =>
{
try
{
- var backuplist = FileUtils.ReadFiles();
- int index = 0;
- string oldRegionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID.ToString());
- 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);
- }
- //鍊掑嚭鏂颁綇瀹呮暟鎹�
- string newRegionRootPath = FileUtils.CreateRegionBackup(homeTemp.RegionID.ToString());
- FileUtils.RestoreRegionFiles(newRegionRootPath);
- MainPage.LoginUser.SaveUserInfo();
- DB_ResidenceData.residenceData.EixtAccount();
- DB_ResidenceData.residenceData.CurReginID = homeTemp.RegionID;
- OnAppConfig.Instance.SaveUserConfig();
- DB_ResidenceData.InitRoomFunction();
- DB_ResidenceData.residenceData.SaveResidenceData();
+ DB_ResidenceData.Instance.EixtAccount();
+ //鍒锋柊涓�娆′綇瀹呯綉鍏�
+ new HttpServerRequest().GetHomeGatewayList();
+
Application.RunOnMainThread(() =>
{
- btnCurResidenceName.Text = DB_ResidenceData.residenceData.residecenInfo.Name;
+ btnCurResidenceName.Text = DB_ResidenceData.Instance.CurrentRegion.Name;
+ //閲嶇疆缃戝叧鐘舵��
+ DriverLayer.Control.Ins.GatewayOnline = false;
});
+
+ //鎼滅储缃戝叧
+ DriverLayer.Control.Ins.SearchLoaclGateway();
}
catch (Exception ex)
{
@@ -298,6 +222,7 @@
{
waitPage.Hide();
waitPage.RemoveFromParent();
+ MainPage.InitializationData();
});
}
})
@@ -308,12 +233,13 @@
#region 浣忓畢绠＄悊
void LoadEvent_SkipResdentialManagePage()
{
- if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- Action updateResidenceName = () => {
- btnCurResidenceName.Text = DB_ResidenceData.residenceData.residecenInfo.Name;
+ Action updateResidenceName = () =>
+ {
+ btnCurResidenceName.Text = DB_ResidenceData.Instance.CurrentRegion.Name;
};
var residentialManagePage = new ResidentialManagePage(updateResidenceName);
MainPage.BasePageView.AddChidren(residentialManagePage);
@@ -333,11 +259,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);
@@ -355,17 +281,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();
@@ -376,5 +293,59 @@
}
#endregion
+
+ #region F3闃舵
+ #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
+ #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