合并了徐梅的按键面板绑定

黄学彪

2019-09-30 404cdc88627f942df7944af04ee05b9d527752d6

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

@@ -26,7 +26,8 @@
        {

            get

            {

                if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2)

                if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2

                    || Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 3)
                {

                    return AdminMqttKey;

                }

@@ -41,7 +42,8 @@
        {

            get

            {

                if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2)

                if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2

                    || Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 3)
                {

                    return AdminZigbeeMqttBrokerLoadSubDomain;

                }

@@ -56,7 +58,8 @@
        {

            get

            {

                if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2)

                if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2

                    || Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 3)
                {

                    return AdminConnectZigbeeMqttClientId;

                }

@@ -71,7 +74,8 @@
        {

            get

            {

                if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2)

                if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2

                    || Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 3)
                {

                    return AdminConnectZigbeeMqttBrokerPwd;

                }

@@ -86,13 +90,14 @@
        {

            get

            {

                if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2)

                if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2

                    || Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 3)
                {

                    return AdminConnectZigbeeMqttBrokerName;

                }

                return Config.Instance.Account;

            }

        }

            }
        }


        /// <summary>
        /// 账户登录成功的MqttKey
@@ -236,12 +241,6 @@
        {
            get
            {
                //启用管理员权限
                if (this.isAdministrator == true)

                {

                    return this.AdminRequestToken;

                }

                string md5Password;
                if (string.IsNullOrEmpty(Password))
                {
@@ -263,29 +262,16 @@
        }

        /// <summary>

        /// 当前帐号的Token(拥有管理员权限的成员使用远程的时候使用)

        /// </summary>
        public string AdminToken

        {

            get

            {

                if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2)

                {

                    return this.AdminRequestToken;

                }

                return this.Token;

            }

        }

        /// <summary>
        /// 登录过的帐号信息
        /// </summary>
        public List<string> AccountList = new List<string> { };

        public List<string> HomeFilePathList = new List<string> { };

        public string HomeId = string.Empty;

        public string HomeId = string.Empty;



        [Newtonsoft.Json.JsonIgnore]
        private House m_Home = null;
        /// <summary>
        /// 当前住宅
        /// </summary>
@@ -295,12 +281,20 @@
        {
            get
            {
                var house = House.GetHouseByHouseId(HomeId);
                if (house == null)
                {
                    return new House { };
                if (m_Home != null)

                {

                    return m_Home;

                }
                return house;
                m_Home = House.GetHouseByHouseId(HomeId);
                if (m_Home == null)
                {
                    m_Home = new House();
                }
                return m_Home;
            }
            set

            {

                m_Home = value;

            }
        }