From 0e1c6c25b1b0961d324811ff2132717a80f99efe Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期日, 26 四月 2020 14:15:05 +0800
Subject: [PATCH] 2020-04-26 1.添加住宅和修改住宅时,改为子线程操作。 2.远程连接模式时,禁用搜索网关和添加设备。3.修复切换住宅时,提示远程连接Loading不关闭问题。

---
 Crabtree/SmartHome/HDL/Operation/UserInfo.cs |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/Crabtree/SmartHome/HDL/Operation/UserInfo.cs b/Crabtree/SmartHome/HDL/Operation/UserInfo.cs
old mode 100755
new mode 100644
index 25b80ac..b4728c8
--- a/Crabtree/SmartHome/HDL/Operation/UserInfo.cs
+++ b/Crabtree/SmartHome/HDL/Operation/UserInfo.cs
@@ -15,6 +15,16 @@
         public static string GlobalRegisterFile = "Register_File";
 
         /// <summary>
+        /// Guid
+        /// </summary>
+        public string Guid = "";
+
+        /// <summary>
+        /// MD5PWD
+        /// </summary>
+        public string MD5PWD = "";
+
+        /// <summary>
         /// 鐢ㄦ埛
         /// </summary>
         public string AccountString="";
@@ -29,7 +39,7 @@
         /// <summary>
         /// 鐢ㄦ埛ID
         /// </summary>
-        public int ID;
+        public string ID;
 
         /// <summary>
         /// 鍘熷瘑鐮�
@@ -54,7 +64,16 @@
 
         public int AccountType = 0;
 
-        public int MasterID = 0;
+        //public int MasterID = 0;
+        public string MainUserId = "";
+
+
+        public string LoginToken = "";
+        //public string LoginTokenString {
+        //    get {
+        //        return LoginToken;
+        //    }
+        //}
 
         public string LoginTokenString{
             get {

--
Gitblit v1.8.0