From 4f40e8385ff6725be8e8b642e50f9f7201a27dfa Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 15:58:32 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL_ON/UI/MainPage.cs | 177 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 140 insertions(+), 37 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 6caaac3..dbc4eed 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -48,6 +48,11 @@
/// 杩滅▼妯″紡
/// </summary>
public static bool IsRemote = false;
+ /// <summary>
+ /// 缃戠粶杩炴帴鐘舵��
+ /// 0:鏃犵綉缁�
+ /// </summary>
+ public static int InternetStatus = 2;
///// <summary>
///// 鍏徃浠ｇ爜
@@ -99,28 +104,19 @@
var pm = new DAL.Server.HttpServerRequest();
pm.RefreshToken();//鍒锋柊Token
pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
- })
- { IsBackground = true }.Start();
- new System.Threading.Thread(() =>
- {
- var pm =new DAL.Server.HttpServerRequest();
pm.GetUserInfo();//鍒锋柊涓汉淇℃伅
})
{ IsBackground = true }.Start();
-
+
GoUserPage();
//鍚姩瀵嗙爜楠岃瘉
new AppUnlockPage().LoadPage();
- //璇诲彇闊充箰淇℃伅
- UI.Music.A31MusicModel.ReadMusicStates();
- //鎼滅储缃戝叧
-#if DEBUG
- Entity.DB_ResidenceData.residenceData.residenceGatewayMAC = "4E47323347591243";
- Entity.DB_ResidenceData.residenceData.GatewayType = 0;
-#endif
- DriverLayer.Control.Ins.SearchLoaclGateway();
+ ///鍒濆鍖朼pp鏁版嵁
+ InitializationData();
}
+
+
}
catch (Exception ex)
{
@@ -152,34 +148,116 @@
/// </summary>
public static void GoUserPage()
{
- BaseView.RemoveAll();
- BasePageView = new PageLayout();
- BasePageView.ScrollEnabled = false;
- BasePageView.IsShowPoint = false;
- BasePageView.PageChange = (sender, e) => {
- if (e < BasePageView.ChildrenCount - 1)
+ //鍔犺浇Loading鏁堟灉
+ var waitPage = new Loading();
+ BaseView.AddChidren(waitPage);
+ waitPage.Start(Language.StringByID(StringId.PleaseWait));
+ new System.Threading.Thread(() =>
+ {
+ try
{
- MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
- }
+ if (UserInfo.Current.regionList.Count == 0)
+ {
+ bool loadPage = true;
+ var pm = new DAL.Server.HttpServerRequest();
+ while (UserInfo.Current.regionList.Count == 0)
+ {
+ pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
+ System.Threading.Thread.Sleep(3000);
+ if (loadPage)
+ {
+ loadPage = false;
+ Application.RunOnMainThread(() =>
+ {
+ waitPage.Hide();
+ var addResidencePage = new BindingResidencePage();
+ BaseView.AddChidren(addResidencePage);
+ addResidencePage.LoadDialog();
+ });
+ }
+ }
+ }
+ ///绛夊緟鑾峰彇浣忓畢淇℃伅
+ Application.RunOnMainThread(() =>
+ {
+ waitPage.Hide();
+ BaseView.RemoveAll();
+ BasePageView = new PageLayout();
+ BasePageView.ScrollEnabled = false;
+ BasePageView.IsShowPoint = false;
+ BasePageView.PageChange = (sender, e) =>
+ {
+ if (e < BasePageView.ChildrenCount - 1)
+ {
+ MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
+ }
- while (e < BasePageView.ChildrenCount - 1)
+ while (e < BasePageView.ChildrenCount - 1)
+ {
+ BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
+ }
+ };
+ BasePageView.MouseDownEventHandler += (sender, e) =>
+ {
+ BasePageView.ScrollEnabled = true;
+ };
+ BasePageView.MouseUpEventHandler += (sender, e) =>
+ {
+ BasePageView.ScrollEnabled = false;
+ };
+ BaseView.AddChidren(BasePageView);
+
+ //璺宠浆椤甸潰----
+ var userPage = new UserPage();
+ BasePageView.AddChidren(userPage);
+ userPage.LoadPage();
+ BasePageView.PageIndex = 0;
+ });
+ }catch(Exception ex)
{
- BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
+ MainPage.Log($"GoUserPage : {ex.Message}");
}
- };
- BasePageView.MouseDownEventHandler += (sender, e) => {
- BasePageView.ScrollEnabled = true;
- };
- BasePageView.MouseUpEventHandler += (sender, e) => {
- BasePageView.ScrollEnabled = false;
- };
- BaseView.AddChidren(BasePageView);
+ }).Start();
+ }
- //璺宠浆椤甸潰----
- var userPage = new UserPage();
- BasePageView.AddChidren(userPage);
- userPage.LoadPage();
- BasePageView.PageIndex = 0;
+ /// <summary>
+ /// 鍒濆鍖朼pp鎵�闇�瑕佺殑鏁版嵁
+ /// </summary>
+ public static void InitializationData()
+ {
+ new System.Threading.Thread(() =>
+ {
+ while (true)
+ {
+ if (Entity.DB_ResidenceData.residenceData == null ||
+ Entity.DB_ResidenceData.residenceData.HomeGateway == null)
+ {
+ System.Threading.Thread.Sleep(100);
+ }
+ else
+ {
+ break;
+ }
+ }
+ #region 璇诲彇浜戠鏁版嵁--
+ //todo鏁版嵁瑕嗙洊澶勭悊
+ //璇诲彇浜戠鎴块棿銆佹ゼ灞傛暟鎹�
+ Entity.SpatialInfo.CurrentSpatial.DownloadRoomList();
+ //璇诲彇浜戠璁惧鏁版嵁
+ Entity.FunctionList.List.DownloadFunctionList();
+ //璇诲彇浜戠鍦烘櫙鏁版嵁
+ Entity.FunctionList.List.DownloadSceneList();
+ #endregion
+
+ })
+ { IsBackground = true }.Start();
+
+ #region 璇诲彇鏈湴鏁版嵁
+ //璇诲彇闊充箰淇℃伅
+ UI.Music.A31MusicModel.ReadMusicStates();
+ //鎼滅储缃戝叧
+ DriverLayer.Control.Ins.SearchLoaclGateway();
+ #endregion
}
/// <summary>
@@ -192,6 +270,31 @@
#endif
}
+ /// <summary>
+ /// 鐢熸垚13浣嶆椂闂存埑
+ /// </summary>
+ /// <param name="value">鏃堕棿</param>
+ /// <returns></returns>
+ public static long GetTimestamp13bit(DateTime value)
+ {
+ return new DateTimeOffset(value).ToUnixTimeSeconds();
+ }
+
+ /// <summary>
+ /// 鑾峰彇鏃堕棿
+ /// </summary>
+ /// <param name="timestamp"></param>
+ /// <returns></returns>
+ public static DateTime GetDateTime (long timestamp)
+ {
+ long begtime = timestamp * 10000000;
+ DateTime dt_1970 = new DateTime(1970, 1, 1, 0, 0, 0);
+ long tricks_1970 = dt_1970.Ticks;//1970骞�1鏈�1鏃ュ埢搴�
+ long time_tricks = tricks_1970 + begtime;//鏃ュ織鏃ユ湡鍒诲害
+ DateTime dt = new DateTime(time_tricks);//杞寲涓篋ateTime
+ return dt;
+ }
}
+
}
--
Gitblit v1.8.0