From 49248e3bdff0458f8f6f4156d1425bd6f6074e32 Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期二, 17 五月 2022 13:17:21 +0800
Subject: [PATCH] Merge branch 'dev' into lss
---
HDL_ON/Common/UserInfo.cs | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/Common/UserInfo.cs b/HDL_ON/Common/UserInfo.cs
index c82538d..5ba0686 100644
--- a/HDL_ON/Common/UserInfo.cs
+++ b/HDL_ON/Common/UserInfo.cs
@@ -160,6 +160,29 @@
}
}
+ [Newtonsoft.Json.JsonIgnore]
+ public DateTime LastTimeOpenDoor = DateTime.MinValue;
+ public bool VerOpenDoorPw
+ {
+ get
+ {
+ return (DateTime.Now - LastTime).TotalMinutes > 5;
+ }
+ }
+ [Newtonsoft.Json.JsonIgnore]
+ public string doorPasswordString;
+
+ /// <summary>
+ /// 璁板綍鑷姩鍖栫瓫閫夌殑鎴块棿鐨勬潯浠�
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public Entity.Room logicselectedRoom = new Entity.Room { roomId = "6688",roomName = Language.StringByID(StringId.allAreas) };
+ /// <summary>
+ /// 璁板綍鑷姩鍖栫瓫閫夌殑鍔熻兘鐨勬潯浠�
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public string logicselectedFunction = Language.StringByID(StringId.allFun);
+
#endregion
/// <summary>
--
Gitblit v1.8.0