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 | 77 ++++++++++++++++++++++++++++++++++---- 1 files changed, 69 insertions(+), 8 deletions(-) diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs index 6caaac3..1774eb6 100644 --- a/HDL_ON/UI/MainPage.cs +++ b/HDL_ON/UI/MainPage.cs @@ -111,16 +111,12 @@ 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) { @@ -183,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) @@ -192,6 +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