From e3ad42ffa2fa67c8f6cb4519ca626fa275c8947d Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期三, 02 十二月 2020 16:34:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW' --- HDL_ON/UI/MainPage.cs | 74 ++++++++++++++++++++++++++++++++----- 1 files changed, 64 insertions(+), 10 deletions(-) diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs index 9988c55..4d6eb1a 100644 --- a/HDL_ON/UI/MainPage.cs +++ b/HDL_ON/UI/MainPage.cs @@ -27,10 +27,11 @@ /// 鐗堟湰鍙� /// </summary> public static string VersionString = "1.0.0924"; - /// <summary> - /// 瀹㈡埛绔被鍨� - /// </summary> - public static string ClientType = APIClientType.HDL_ON_PRO.ToString(); + ///// <summary> + ///// 瀹㈡埛绔被鍨� + ///// </summary> + //public static string ClientType = APIClientType.HDL_ON_PRO.ToString(); + /// <summary> /// /// </summary> @@ -95,24 +96,32 @@ { new System.Threading.Thread(() => { - var pm =new DAL.Server.HttpServerRequest(); - pm.GetUserInfo();//鍒锋柊涓汉淇℃伅 + 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.GetHomePager();//鍒锋柊浣忓畢淇℃伅 + var pm =new DAL.Server.HttpServerRequest(); + pm.GetUserInfo();//鍒锋柊涓汉淇℃伅 }) { IsBackground = true }.Start(); + GoUserPage(); //鍚姩瀵嗙爜楠岃瘉 new AppUnlockPage().LoadPage(); //璇诲彇闊充箰淇℃伅 UI.Music.A31MusicModel.ReadMusicStates(); + //鎼滅储缃戝叧 + #if DEBUG - //new HDL_ON.DAL.Net.TcpListener().OpenServer(8586); -#endif + //Entity.DB_ResidenceData.residenceData.residenceGatewayMAC = "4E47323347591243"; + //Entity.DB_ResidenceData.residenceData.GatewayType = 0; + Entity.DB_ResidenceData.residenceData.residenceGatewayMAC = "123456789AAAAAAA"; + Entity.DB_ResidenceData.residenceData.GatewayType = 1; +#endif + DriverLayer.Control.Ins.SearchLoaclGateway(); } } catch (Exception ex) @@ -175,6 +184,26 @@ BasePageView.PageIndex = 0; } + public static void GetRoomList() + { + var pm = new DAL.Server.HttpServerRequest(); + var packNew = pm.GetRoomList();//鍒锋柊鎴块棿鍒楄〃 + var floorPack = pm.GetRoomList("FLOOR"); + var rooms = Newtonsoft.Json.JsonConvert.DeserializeObject<Entity.RoomApiPack>(packNew.Data.ToString()); + var floors = Newtonsoft.Json.JsonConvert.DeserializeObject<Entity.RoomApiPack>(packNew.Data.ToString()); + MainPage.Log(packNew.Data.ToString()); + MainPage.Log(floorPack.Data.ToString()); + } + + public static void GetDeviceList() + { + var pm = new DAL.Server.HttpServerRequest(); + var packNew = pm.GetDeviceList(); + var functions = Newtonsoft.Json.JsonConvert.DeserializeObject<Entity.DevcieApiPack>(packNew.Data.ToString()); + MainPage.Log(packNew.Data.ToString()); + } + + /// <summary> /// 鑷畾涔夋棩蹇楄緭鍑� /// </summary> @@ -185,6 +214,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