From 122dc4312c72b2d2aaa50a2adf84165f5600b99a Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 27 一月 2021 17:13:48 +0800
Subject: [PATCH] 2021-1-27-1
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 56 ++++++++++++--------------------------------------------
1 files changed, 12 insertions(+), 44 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index 37ea120..aac2c6a 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -161,7 +161,8 @@
{
var regionId = (string)btnHomeName.Tag;
dialog.Close();
- LoadEvent_ChangeCurHome(UserInfo.Current.regionList.Find((obj) => obj.RegionID == regionId));
+ //LoadEvent_ChangeCurHome(UserInfo.Current.regionList.Find((obj) => obj.RegionID == regionId));
+ LoadEvent_ChangeCurHome(home);
LoadContentView();
};
}
@@ -183,47 +184,10 @@
}
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
- {
- DB_ResidenceData.Instance.EixtAccount();
- //鍒锋柊涓�娆′綇瀹呯綉鍏�
- new HttpServerRequest().GetHomeGatewayList();
-
- Application.RunOnMainThread(() =>
- {
- btnCurResidenceName.Text = DB_ResidenceData.Instance.CurrentRegion.Name;
- //閲嶇疆缃戝叧鐘舵��
- DriverLayer.Control.Ins.GatewayOnline = false;
- });
-
- //鎼滅储缃戝叧
- DriverLayer.Control.Ins.SearchLoaclGateway();
- }
- 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();
- MainPage.InitializationData();
- });
- }
- })
- { IsBackground = true }.Start();
+ btnCurResidenceName.Text = DB_ResidenceData.Instance.CurrentRegion.Name;
+ DB_ResidenceData.Instance.EixtAccount();
+ //鍒锋柊浣忓畢鏁版嵁
+ Common.ApiUtlis.Ins.DownloadData();
}
#endregion
@@ -291,20 +255,24 @@
#endregion
+ #region F3闃舵
#region 娣诲姞璁惧
void LoadEvent_SkipbtnAddFunctionPage()
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- var page = new SearchDevicePage();
+ var page = new HDL_ON.UI.UI2.Intelligence.Automation.EmptyClass();
MainPage.BasePageView.AddChidren(page);
- page.LoadPage();
+ page.Show(new System.Collections.Generic.List<string>(),null,(str)=> {
+
+ });
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
btnResidenceAddFunctionIcon.MouseUpEventHandler = eventHandler;
btnResidenceAddFunctionText.MouseUpEventHandler = eventHandler;
}
#endregion
+ #endregion
#region 鍏充簬On銆佽幏鍙栨敮鎸�
/// <summary>
--
Gitblit v1.8.0