2019-11-14-1

WJC

2019-11-14 653b65a9bd3d3df806f7cbecc767085cd506058d

 ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs

old mode 100755
new mode 100644
@@ -98,6 +98,21 @@
                return Config.Instance.Account;

            }
        }
        /// <summary>
        /// 当前需要连接云端ZigbeeMqttBroker的连接的密码
        /// </summary>
        public string ConnectGuid
        {
            get
            {
                if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2
                    || Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 3)
                {
                    return AdminConnectZigbeeMqttBrokerName;
                }
                return Config.Instance.Guid;
            }
        }


        /// <summary>
        /// 账户登录成功的MqttKey
@@ -158,7 +173,10 @@
                return (DateTime.Now - LoginDateTime).Days < 7;
            }
        }

        /// <summary>
        ///暂时默认
        /// </summary>
        public string UserName = string.Empty;
        /// <summary>
        /// 账户登录成功的账户类型
        /// </summary>
@@ -167,10 +185,7 @@
        /// 账户登录成功的主ID
        /// </summary>
        public int MasterID = 0;
        /// <summary>
        /// 用户ID
        /// </summary>
        public int UserID = 0;


        public static void ReFresh()
        {
@@ -182,7 +197,7 @@
                config = new Config { };
            }
        }

        
        /// <summary>
        /// 当前登录的帐号
        /// </summary>
@@ -269,7 +284,7 @@
        public List<string> HomeFilePathList = new List<string> { };

        public string HomeId = string.Empty;



 
        [Newtonsoft.Json.JsonIgnore]
        private House m_Home = null;
        /// <summary>