Merge branch 'DEV_GXC' of http://172.16.1.23:6688/r/~xm/HomeApp into DEV_GXC

gxc

2019-10-29 ed2f4a97aa48cdb4a013d2a389877f52eb3eccdf

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

@@ -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
@@ -167,10 +182,7 @@
        /// 账户登录成功的主ID
        /// </summary>
        public int MasterID = 0;
        /// <summary>
        /// 用户ID
        /// </summary>
        public int UserID = 0;


        public static void ReFresh()
        {