From 4564687f2ada89760eda21568baa9cfdc3ff3fa4 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 11 三月 2022 15:06:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/release0123' into wjc

---
 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..b7a8838 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;
+
         #endregion
 
         /// <summary>

--
Gitblit v1.8.0