From 30b5770f56f99c1f92e933ad31cf7d2af58b033c Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 02 十二月 2020 16:31:48 +0800
Subject: [PATCH] 20201202
---
HDL_ON/UI/MainPage.cs | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index bb50cbc..4d6eb1a 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -1,4 +1,4 @@
-using System;
+锘縰sing System;
using System.Collections.Generic;
using HDL_ON.DAL;
using HDL_ON.UI;
@@ -94,7 +94,6 @@
}
else
{
-
new System.Threading.Thread(() =>
{
var pm = new DAL.Server.HttpServerRequest();
@@ -117,8 +116,10 @@
//鎼滅储缃戝叧
#if DEBUG
- Entity.DB_ResidenceData.residenceData.residenceGatewayMAC = "4E47323347591243";
- Entity.DB_ResidenceData.residenceData.GatewayType = 0;
+ //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();
}
@@ -183,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>
@@ -193,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