From d616b67bd6ea95562af73a00bf0aab38eec935df Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 11 十二月 2020 13:37:26 +0800
Subject: [PATCH] 2020-12-11 1.取消屏幕常亮。2.优化iOS接收推送处理。
---
HDL_ON/UI/MainPage.cs | 149 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 109 insertions(+), 40 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 5f3ef66..1774eb6 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -9,15 +9,32 @@
{
public static class MainPage
{
+ /// <summary>
+ /// BaseView
+ /// </summary>
public static FrameLayout BaseView { get; internal set; }
+ /// <summary>
+ /// BasePageView
+ /// </summary>
public static PageLayout BasePageView { get; set; }
-
+ /// <summary>
+ /// DisplayCompleted
+ /// </summary>
public static bool DisplayCompleted = false;
- public static UserInfo LoginUser;
-
+ //public static UserInfo LoginUser;
+ /// <summary>
+ /// 鐗堟湰鍙�
+ /// </summary>
public static string VersionString = "1.0.0924";
+ ///// <summary>
+ ///// 瀹㈡埛绔被鍨�
+ ///// </summary>
+ //public static string ClientType = APIClientType.HDL_ON_PRO.ToString();
+ /// <summary>
+ ///
+ /// </summary>
public static Entity.CityInfo cityInfo = new Entity.CityInfo();
/// <summary>
/// 澶╂皵鍒锋柊action
@@ -32,12 +49,12 @@
/// </summary>
public static bool IsRemote = false;
- /// <summary>
- /// 鍏徃浠ｇ爜
- /// 棰勭暀绗笁鏂瑰畾鍒舵爣璁�
- /// 0:HDL
- /// </summary>
- public static int Company = 0;
+ ///// <summary>
+ ///// 鍏徃浠ｇ爜
+ ///// 棰勭暀绗笁鏂瑰畾鍒舵爣璁�
+ ///// 0:HDL
+ ///// </summary>
+ //public static int Company = 0;
/// <summary>
/// 鏄惁鍏ㄩ潰灞忔墜鏈�
@@ -69,51 +86,37 @@
BaseView = Application.MainPage;
Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;
- //BusSocket.Start();
- //CommonPage.InitReceiveEvent();
-
- LoginUser = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(System.Text.Encoding.UTF8.GetString(FileUtils.ReadFile("UserInfo_File")));
+ //LoginUser = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(System.Text.Encoding.UTF8.GetString(FileUtils.ReadFile("UserInfo_File")));
//鍒ゆ柇闇�涓嶉渶瑕佺櫥褰曪紝鏈夋病鏈夌櫥褰曪紝鎴栬�呯櫥褰曟槸鍚﹁繃鏈燂紝
- if (LoginUser == null || !LoginUser.IsLogin)
+ if (UserInfo.Current == null || !UserInfo.Current.IsLogin)
{
- GoLoginPage(LoginUser);
+ GoLoginPage(UserInfo.Current);
}
else
{
- //UdpSocket._BusSocket.Start();
- //if (Entity.DB_ResidenceData.residenceData.GatewayType == 1)
- //{
- // BusSocket.Start();
- // CommonPage.InitReceiveEvent();
- // Control.ReadGatewayIPAddress();
- //}
- //else
- //{
- // BusSocket.Start();
- // CommonPage.InitReceiveEvent();
- //}
-
+ new System.Threading.Thread(() =>
+ {
+ 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();
- new System.Threading.Thread(() =>
- {
- var pm = new DAL.Server.HttpServerRequest();
- pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
- })
- { IsBackground = true }.Start();
+
GoUserPage();
//鍚姩瀵嗙爜楠岃瘉
new AppUnlockPage().LoadPage();
- //璇诲彇闊充箰淇℃伅
- UI.Music.A31MusicModel.ReadMusicStates();
-#if DEBUG
- //new HDL_ON.DAL.Net.TcpListener().OpenServer(8586);
-#endif
+
+ ///鍒濆鍖朼pp鏁版嵁
+ InitializationData();
}
+
+
}
catch (Exception ex)
{
@@ -130,7 +133,7 @@
/// <summary>
/// 杩涘叆鐧诲綍鐣岄潰
/// </summary>
- public static void GoLoginPage(UserInfo userInfo =null)
+ public static void GoLoginPage(UserInfo userInfo = null)
{
BaseView.RemoveAll();
BaseView.BackgroundColor = CSS_Color.BackgroundColor;
@@ -176,6 +179,46 @@
}
/// <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>
/// 鑷畾涔夋棩蹇楄緭鍑�
/// </summary>
public static void Log(string msg)
@@ -185,5 +228,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