HDL Home App 第二版本 旧平台金堂用 正在使用
黄学彪
2019-12-02 4c40f503acf2bcf90d294cc439ef46ba259b9c60
ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
@@ -19,139 +19,6 @@
                return config;
            }
        }
        /// <summary>
        /// 账户登录成功的MqttKey
        /// </summary>
        public string MqttKey
        {
            get
            {
                if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2
                    || Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 3)
                {
                    return AdminMqttKey;
                }
                return MeMqttKey;
            }
            set { MeMqttKey = value; }
        }
        /// <summary>
        /// 当前需要连接云端ZigbeeMqttBroker的连接地址
        /// </summary>
        public string ZigbeeMqttBrokerLoadSubDomain
        {
            get
            {
                if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2
                    || Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 3)
                {
                    return AdminZigbeeMqttBrokerLoadSubDomain;
                }
                return MeZigbeeMqttBrokerLoadSubDomain;
            }
            set { MeZigbeeMqttBrokerLoadSubDomain = value; }
        }
        /// <summary>
        /// 当前需要连接云端ZigbeeMqttBroker的连接的ClientId
        /// </summary>
        public string ConnectZigbeeMqttClientId
        {
            get
            {
                if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2
                    || Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 3)
                {
                    return AdminConnectZigbeeMqttClientId;
                }
                return MeConnectZigbeeMqttClientId;
            }
            set { MeConnectZigbeeMqttClientId = value; }
        }
        /// <summary>
        /// 当前需要连接云端ZigbeeMqttBroker的连接的密码
        /// </summary>
        public string ConnectZigbeeMqttBrokerPwd
        {
            get
            {
                if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2
                    || Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 3)
                {
                    return AdminConnectZigbeeMqttBrokerPwd;
                }
                return MeConnectZigbeeMqttBrokerPwd;
            }
            set { MeConnectZigbeeMqttBrokerPwd = value; }
        }
        /// <summary>
        /// 当前需要连接云端ZigbeeMqttBroker的连接的密码
        /// </summary>
        public string ConnectZigbeeMqttBrokerName
        {
            get
            {
                if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2
                    || Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 3)
                {
                    return AdminConnectZigbeeMqttBrokerName;
                }
                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
        /// </summary>
        private string MeMqttKey = string.Empty;
        /// <summary>
        /// 当前需要连接云端ZigbeeMqttBroker的连接地址
        /// </summary>
        private string MeZigbeeMqttBrokerLoadSubDomain = string.Empty;
        /// <summary>
        /// 当前需要连接云端ZigbeeMqttBroker的连接的ClientId
        /// </summary>
        private string MeConnectZigbeeMqttClientId = string.Empty;
        /// <summary>
        /// 当前需要连接云端ZigbeeMqttBroker的连接的密码
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        private string MeConnectZigbeeMqttBrokerPwd = string.Empty;
        /// <summary>
        /// 账户登录成功的MqttKey(管理员身份用)
        /// </summary>
        public string AdminMqttKey = string.Empty;
        /// <summary>
        /// 当前需要连接云端ZigbeeMqttBroker的连接地址(管理员身份用)
        /// </summary>
        public string AdminZigbeeMqttBrokerLoadSubDomain = string.Empty;
        /// <summary>
        /// 当前需要连接云端ZigbeeMqttBroker的连接的ClientId(管理员身份用)
        /// </summary>
        public string AdminConnectZigbeeMqttClientId = string.Empty;
        /// <summary>
        /// 应该是叫远程连接的名字吧
        /// </summary>
        public string AdminConnectZigbeeMqttBrokerName = string.Empty;
        /// <summary>
        /// 当前需要连接云端ZigbeeMqttBroker的连接的密码(管理员身份用)
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public string AdminConnectZigbeeMqttBrokerPwd = string.Empty;
        /// <summary>
        /// 服务器注册ID
@@ -223,32 +90,11 @@
        /// 成员请求控制主帐号此住宅时请求基地址的LoginAccessToken的值
        /// </summary>
        public string AdminRequestToken = string.Empty;
        /// <summary>
        /// 固件名称
        /// </summary>
        //public string Name = string.Empty;
        ///// <summary>
        ///// 固件唯一标识
        ///// </summary>
        //public string DistributedMark = string.Empty;
        ///// <summary>
        ///// 固件版本
        ///// </summary>
        //public string FirmwareVersion = string.Empty;
        ///// <summary>
        ///// 固件备注
        ///// </summary>
        //public string Remarks = string.Empty;
        ///// <summary>
        ///// 固件ID
        ///// </summary>
        //public string Id;
        [Newtonsoft.Json.JsonIgnore]
        /// <summary>
        /// 当前帐号的Token
        /// </summary>
        private string Token1 = "";
        public string Token
        {
            get