From ea285ffe71284f5499e870f89c65b710d2d6a79c Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期一, 27 六月 2022 10:54:32 +0800
Subject: [PATCH] Merge branch 'wxr0114' of http://59.41.255.150:6688/r/~wxr/OnPro into wxr0114

---
 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