From 388ece21a0c608c2571775137a89ad32ca0cedd8 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 11 一月 2021 14:35:23 +0800
Subject: [PATCH] 2021-1-11-2
---
HDL_ON/UI/MainPage.cs | 183 +++++++++++++++++++++++++--------------------
1 files changed, 102 insertions(+), 81 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index dbc4eed..89e3557 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.0.1222";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -44,15 +44,19 @@
/// 鏃犵櫥褰曟ā寮�
/// </summary>
public static bool NoLoginMode = false;
- /// <summary>
- /// 杩滅▼妯″紡
- /// </summary>
- public static bool IsRemote = false;
+ ///// <summary>
+ ///// 杩滅▼妯″紡
+ ///// </summary>
+ //public static bool IsRemote = false;
/// <summary>
/// 缃戠粶杩炴帴鐘舵��
/// 0:鏃犵綉缁�
/// </summary>
public static int InternetStatus = 2;
+ /// <summary>
+ /// 鏄惁杩涘叆鍚庡彴
+ /// </summary>
+ public static bool IsEnterBackground = false;
///// <summary>
///// 鍏徃浠ｇ爜
@@ -91,32 +95,33 @@
BaseView = Application.MainPage;
Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;
- //LoginUser = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(System.Text.Encoding.UTF8.GetString(FileUtils.ReadFile("UserInfo_File")));
- //鍒ゆ柇闇�涓嶉渶瑕佺櫥褰曪紝鏈夋病鏈夌櫥褰曪紝鎴栬�呯櫥褰曟槸鍚﹁繃鏈燂紝
- if (UserInfo.Current == null || !UserInfo.Current.IsLogin)
+
+ if (string.IsNullOrEmpty(OnAppConfig.Instance.LastLoginUserId))
{
- GoLoginPage(UserInfo.Current);
+ GoLoginPage();
}
else
{
- new System.Threading.Thread(() =>
+ //鍒ゆ柇闇�涓嶉渶瑕佺櫥褰曪紝鏈夋病鏈夌櫥褰曪紝鎴栬�呯櫥褰曟槸鍚﹁繃鏈燂紝
+ if (UserInfo.Current == null || !UserInfo.Current.IsLogin)
{
- var pm = new DAL.Server.HttpServerRequest();
- pm.RefreshToken();//鍒锋柊Token
- pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
- pm.GetUserInfo();//鍒锋柊涓汉淇℃伅
- })
- { IsBackground = true }.Start();
+ GoLoginPage(UserInfo.Current);
+ }
+ else
+ {
+ //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();
- //鍚姩瀵嗙爜楠岃瘉
- new AppUnlockPage().LoadPage();
-
- ///鍒濆鍖朼pp鏁版嵁
- InitializationData();
+ GoUserPage(false,true);
+ }
}
-
-
}
catch (Exception ex)
{
@@ -146,37 +151,31 @@
/// <summary>
/// 杩涘叆涓婚〉
/// </summary>
- public static void GoUserPage()
+ /// <param name="isFirstOpen">濡傛灉鏄涓�娆″惎鍔� 妫�娴嬫牎楠屽瘑鐮�</param>
+ /// <param name="pageShowEvent">涓婚〉鏄剧ず涔嬪悗瑙﹀彂鐨勪簨浠�(娌℃湁浣忓畢鐨勮瘽,鍒欎笉浼氳Е鍙�)</param>
+ public static void GoUserPage(bool downloadData , bool isFirstOpen = false, Action pageShowEvent = null)
{
//鍔犺浇Loading鏁堟灉
var waitPage = new Loading();
BaseView.AddChidren(waitPage);
waitPage.Start(Language.StringByID(StringId.PleaseWait));
+
+ //褰撴病鏈変綇瀹呮椂,涓嶈兘璁╁畠寰�涓嬭蛋
+ if (UserInfo.Current.regionList.Count == 0)
+ {
+ waitPage.Hide();
+ var addResidencePage = new BindingResidencePage();
+ BaseView.AddChidren(addResidencePage);
+ addResidencePage.LoadView();
+ return;
+ }
+
new System.Threading.Thread(() =>
{
try
{
- 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();
- });
- }
- }
- }
+ Entity.FunctionList.List.Clear();
+ Entity.SpatialInfo.CurrentSpatial.Clear();
///绛夊緟鑾峰彇浣忓畢淇℃伅
Application.RunOnMainThread(() =>
{
@@ -207,15 +206,35 @@
};
BaseView.AddChidren(BasePageView);
- //璺宠浆椤甸潰----
- var userPage = new UserPage();
+ //璺宠浆椤甸潰----
+ var userPage = new UserPage();
BasePageView.AddChidren(userPage);
userPage.LoadPage();
BasePageView.PageIndex = 0;
+
+ if (isFirstOpen)
+ {
+ //鍚姩瀵嗙爜楠岃瘉
+ new AppUnlockPage().LoadPage(isFirstOpen);
+ }
+ //涓婚〉鍔犺浇瀹屾垚,鍥炶皟浜嬩欢
+ pageShowEvent?.Invoke();
+ pageShowEvent = null;
});
- }catch(Exception ex)
+ }
+ catch (Exception ex)
{
MainPage.Log($"GoUserPage : {ex.Message}");
+ }finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (downloadData)
+ {
+ ///鍒濆鍖朼pp鏁版嵁
+ Common.ApiUtlis.Ins.DownloadData();
+ };
+ });
}
}).Start();
}
@@ -223,41 +242,43 @@
/// <summary>
/// 鍒濆鍖朼pp鎵�闇�瑕佺殑鏁版嵁
/// </summary>
- public static void InitializationData()
+ public static void InitializationData1()
{
- 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
+ //new System.Threading.Thread(() =>
+ //{
+ // int count = 0;
+ // while (count< 10)
+ // {
+ // if (Entity.DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull() )//|| Entity.DB_ResidenceData.residenceData.HomeGateway == null)
+ // {
+ // System.Threading.Thread.Sleep(200);
+ // }
+ // else
+ // {
+ // break;
+ // }
+ // count++;
+ // }
+ // if(Entity.DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
+ // {
+ // return;
+ // }
+ // //System.Threading.Thread.Sleep(2000);
+ // #region 璇诲彇浜戠鏁版嵁--
+ // //todo鏁版嵁瑕嗙洊澶勭悊
+ // //璇诲彇浜戠鎴块棿銆佹ゼ灞傛暟鎹�
+ // Entity.SpatialInfo.CurrentSpatial.DownloadRoomList();
+ // //璇诲彇浜戠璁惧鏁版嵁
+ // Entity.FunctionList.List.DownloadFunctionList();
+ // //璇诲彇浜戠鍦烘櫙鏁版嵁
+ // Entity.FunctionList.List.DownloadSceneList();
+ // //璇诲彇閫昏緫鍒楄〃
+ // UI.UI2.Intelligence.Automation.MainView.GetLogicList();
+ // #endregion
- })
- { IsBackground = true }.Start();
+ //})
+ //{ IsBackground = true }.Start();
- #region 璇诲彇鏈湴鏁版嵁
- //璇诲彇闊充箰淇℃伅
- UI.Music.A31MusicModel.ReadMusicStates();
- //鎼滅储缃戝叧
- DriverLayer.Control.Ins.SearchLoaclGateway();
- #endregion
}
/// <summary>
--
Gitblit v1.8.0