From bee4133c05f9c41f24ec7fa7449faabb79306087 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 21 一月 2021 15:47:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL' into NewFilePath
---
HDL_ON/UI/MainPage.cs | 141 +++++++++++++++++++++++-----------------------
1 files changed, 70 insertions(+), 71 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index eb169f9..f1271bf 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.0.0924";
+ public static string VersionString = "1.1.0119";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -45,14 +45,14 @@
/// </summary>
public static bool NoLoginMode = false;
/// <summary>
- /// 杩滅▼妯″紡
- /// </summary>
- public static bool IsRemote = false;
- /// <summary>
/// 缃戠粶杩炴帴鐘舵��
/// 0:鏃犵綉缁�
/// </summary>
public static int InternetStatus = 2;
+ /// <summary>
+ /// 鏄惁杩涘叆鍚庡彴
+ /// </summary>
+ public static bool IsEnterBackground = false;
///// <summary>
///// 鍏徃浠ｇ爜
@@ -92,6 +92,12 @@
Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;
+ //#region 娴嬭瘯
+ //var ddd = new UI.test.TestDialog();
+ //ddd.InitView();
+ //return;
+ //#endregion
+
if (string.IsNullOrEmpty(OnAppConfig.Instance.LastLoginUserId))
{
GoLoginPage();
@@ -105,16 +111,17 @@
}
else
{
- new System.Threading.Thread(() =>
- {
- var pm = new DAL.Server.HttpServerRequest();
- pm.RefreshToken();//鍒锋柊Token
- pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
- pm.GetUserInfo();//鍒锋柊涓汉淇℃伅
- })
- { IsBackground = true }.Start();
+ //new System.Threading.Thread(() =>
+ //{
+ // var pm = new DAL.Server.HttpServerRequest();
+ // pm.RefreshToken();//鍒锋柊Token
+ // pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
+ // pm.GetUserInfo();//鍒锋柊涓汉淇℃伅
+ //})
+ //{ IsBackground = true }.Start();
+ Common.ApiUtlis.Ins.DownloadData();
- GoUserPage(true);
+ GoUserPage(false,true);
}
}
}
@@ -148,7 +155,7 @@
/// </summary>
/// <param name="isFirstOpen">濡傛灉鏄涓�娆″惎鍔� 妫�娴嬫牎楠屽瘑鐮�</param>
/// <param name="pageShowEvent">涓婚〉鏄剧ず涔嬪悗瑙﹀彂鐨勪簨浠�(娌℃湁浣忓畢鐨勮瘽,鍒欎笉浼氳Е鍙�)</param>
- public static void GoUserPage(bool isFirstOpen = false, Action pageShowEvent = null)
+ public static void GoUserPage(bool downloadData , bool isFirstOpen = false, Action pageShowEvent = null)
{
//鍔犺浇Loading鏁堟灉
var waitPage = new Loading();
@@ -175,6 +182,7 @@
Application.RunOnMainThread(() =>
{
waitPage.Hide();
+ waitPage.RemoveFromParent();
BaseView.RemoveAll();
BasePageView = new PageLayout();
BasePageView.ScrollEnabled = false;
@@ -202,9 +210,9 @@
BaseView.AddChidren(BasePageView);
//璺宠浆椤甸潰----
- var userPage = new UserPage();
- BasePageView.AddChidren(userPage);
- userPage.LoadPage();
+ var UserBasePage = new UserPage();
+ BasePageView.AddChidren(UserBasePage);
+ UserBasePage.LoadPage();
BasePageView.PageIndex = 0;
if (isFirstOpen)
@@ -222,51 +230,66 @@
MainPage.Log($"GoUserPage : {ex.Message}");
}finally
{
- ///鍒濆鍖朼pp鏁版嵁
- InitializationData();
+ Application.RunOnMainThread(() =>
+ {
+ if (downloadData)
+ {
+ ///鍒濆鍖朼pp鏁版嵁
+ Common.ApiUtlis.Ins.DownloadData();
+ };
+ });
}
}).Start();
}
/// <summary>
- /// 鍒濆鍖朼pp鎵�闇�瑕佺殑鏁版嵁
+ /// 鍚庨��浜嬩欢
+ /// 0:鍚庨��
+ /// 1:鏈夌瓑寰呯晫闈�
+ /// 2:鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
/// </summary>
- public static void InitializationData()
+ public static int LoadEvent_BackAction()
{
- new System.Threading.Thread(() =>
+ int result = 0;
+ Application.RunOnMainThread(() =>
{
- while (true)
+ if (BaseView.ChildrenCount>1)
{
- if (Entity.DB_ResidenceData.Instance == null )//|| Entity.DB_ResidenceData.residenceData.HomeGateway == null)
+ var view = BaseView.GetChildren(BaseView.ChildrenCount - 1);
+ if(view.GetType() == typeof(Loading))
{
- System.Threading.Thread.Sleep(100);
+ var loading = view as Loading;
+ if (loading.CurStatus == false)//鏈変竴浜涚瓑寰呯晫闈㈤殣钘忎簡锛屼絾鏄病鏈夌Щ闄ゅ埌锛岄渶瑕佸厛绉婚櫎
+ {
+ loading.RemoveFromParent();
+ result = LoadEvent_BackAction();
+ }
+ else
+ {
+ result = 1;//姝ｅ湪绛夊緟鏌愪簺鎿嶄綔
+ }
+ }
+ }
+ else
+ {
+ if (BasePageView.ChildrenCount > 1)
+ {
+ int index = BasePageView.ChildrenCount - 1;
+ var view = BasePageView.GetChildren(index);
+ if (view != null)
+ {
+ view.RemoveFromParent();
+ }
}
else
{
- break;
+ result = 2;//鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
}
}
- //System.Threading.Thread.Sleep(2000);
- #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
+ });
+ return result;
}
+
/// <summary>
/// 鑷畾涔夋棩蹇楄緭鍑�
@@ -278,30 +301,6 @@
#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