~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -19,119 +19,6 @@
			return config;
			}
			}
			/// <summary>
			/// 账户登录成功的MqttKey
			/// </summary>
			public string MqttKey
			{
			get
			{
			if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2)
			{
			return AdminMqttKey;
			}
			return MeMqttKey;
			}
			set { MeMqttKey = value; }
			}
			/// <summary>
			/// 当前需要连接云端ZigbeeMqttBroker的连接地址
			/// </summary>
			public string ZigbeeMqttBrokerLoadSubDomain
			{
			get
			{
			if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2)
			{
			return AdminZigbeeMqttBrokerLoadSubDomain;
			}
			return MeZigbeeMqttBrokerLoadSubDomain;
			}
			set { MeZigbeeMqttBrokerLoadSubDomain = value; }
			}
			/// <summary>
			/// 当前需要连接云端ZigbeeMqttBroker的连接的ClientId
			/// </summary>
			public string ConnectZigbeeMqttClientId
			{
			get
			{
			if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2)
			{
			return AdminConnectZigbeeMqttClientId;
			}
			return MeConnectZigbeeMqttClientId;
			}
			set { MeConnectZigbeeMqttClientId = value; }
			}
			/// <summary>
			/// 当前需要连接云端ZigbeeMqttBroker的连接的密码
			/// </summary>
			public string ConnectZigbeeMqttBrokerPwd
			{
			get
			{
			if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2)
			{
			return AdminConnectZigbeeMqttBrokerPwd;
			}
			return MeConnectZigbeeMqttBrokerPwd;
			}
			set { MeConnectZigbeeMqttBrokerPwd = value; }
			}
			/// <summary>
			/// 当前需要连接云端ZigbeeMqttBroker的连接的密码
			/// </summary>
			public string ConnectZigbeeMqttBrokerName
			{
			get
			{
			if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2)
			{
			return AdminConnectZigbeeMqttBrokerName;
			}
			return Config.Instance.Account;
			}
			}

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


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


			/// <summary>
			/// 当前登录的帐号
			/// </summary>
			@@ -195,7 +79,7 @@
			/// </summary>
			public string Guid = string.Empty;
			/// <summary>
			/// 是否是管理员权限(为什么会声明这样变量,因为有些接口必须使用原来的Token)
			/// 是否是管理员权限(变更了,成员的时候,这个也为ture。为什么会声明这样变量,因为有些接口必须使用原来的Token)
			/// </summary>
			public bool isAdministrator = false;
			/// <summary>
			@@ -206,42 +90,15 @@
			/// 成员请求控制主帐号此住宅时请求基地址的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
			{
			//启用管理员权限
			if (this.isAdministrator == true)
			{
			return this.AdminRequestToken;
			}

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

			/// <summary>
			/// 当前帐号的Token(拥有管理员权限的成员使用远程的时候使用)
			/// 登录时Token
			/// </summary>
			public string AdminToken
			{
			get
			{
			if (Phone.UserCenter.UserCenterResourse.UserInfo.AuthorityNo == 2)
			{
			return this.AdminRequestToken;
			}
			return this.Token;
			}
			}
			public string LoginToken = string.Empty;

			/// <summary>
			/// <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 +144,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;
			}
			}