From d9feb1d52963982a89a6e6d741a9b841042ce0b6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 22 七月 2022 17:22:41 +0800
Subject: [PATCH] 毫米波传感器,温控一体化

---
 HDL_ON/Common/UserInfo.cs |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/Common/UserInfo.cs b/HDL_ON/Common/UserInfo.cs
index b7a8838..cecd374 100644
--- a/HDL_ON/Common/UserInfo.cs
+++ b/HDL_ON/Common/UserInfo.cs
@@ -166,7 +166,7 @@
         {
             get
             {
-                return (DateTime.Now - LastTime).TotalMinutes > 5;
+                return (DateTime.Now - LastTimeOpenDoor).TotalMinutes > 5;
             }
         }
         [Newtonsoft.Json.JsonIgnore]
@@ -181,7 +181,7 @@
         /// 璁板綍鑷姩鍖栫瓫閫夌殑鍔熻兘鐨勬潯浠�
         /// </summary>
         [Newtonsoft.Json.JsonIgnore]
-        public string logicselectedFunction;
+        public string logicselectedFunction = Language.StringByID(StringId.allFun);
 
         #endregion
 
@@ -322,5 +322,21 @@
             return path + "/";
         }
 
+
+
+        /// <summary>
+        /// 鎺ㄩ�佹秷鎭褰� 
+        /// </summary>
+        public JPushMessageInfo pushMessageInfo = new JPushMessageInfo();
+        /// <summary>
+        /// 鏄惁宸茬粡鍔犺浇鍛煎彨寮圭獥
+        /// </summary>
+        public bool alreadyShowCallInDialog = false;
+
+        [Newtonsoft.Json.JsonIgnore]
+        public bool inVideo = false;
+        [Newtonsoft.Json.JsonIgnore]
+        public DateTime inCall = DateTime.MinValue;
+
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0