~wjc/HomeApp.git

old mode 100644 new mode 100755

			@@ -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
			@@ -173,10 +40,7 @@
			return (DateTime.Now - LoginDateTime).Days < 7;
			}
			}
			/// <summary>
			///暂时默认
			/// </summary>
			public string Nmae = string.Empty;

			/// <summary>
			/// 账户登录成功的账户类型
			/// </summary>
			@@ -196,9 +60,13 @@
			{
			config = new Config { };
			}
			}

			public string Name = string.Empty;
			if (config.PasswordEncrypt != string.Empty)
			{
			//解密
			config.Password = Phone.UserCenter.UserCenterLogic.DecryptPassword("hD1(La3o", config.PasswordEncrypt);
			}
			}

			/// <summary>
			/// 当前登录的帐号
			/// </summary>
			@@ -206,7 +74,12 @@
			/// <summary>
			/// 当前帐号密码
			/// </summary>
			[Newtonsoft.Json.JsonIgnore]
			public string Password = string.Empty;
			/// <summary>
			/// 加密密码
			/// </summary>
			public string PasswordEncrypt = string.Empty;
			/// <summary>
			/// 短信登录返回的md5后的密码
			/// </summary>
			@@ -214,11 +87,7 @@
			/// <summary>
			/// 登陆账号的Guid
			/// </summary>
			public string Guid = string.Empty;
			/// <summary>
			/// 是否是管理员权限(为什么会声明这样变量,因为有些接口必须使用原来的Token)
			/// </summary>
			public bool isAdministrator = false;
			public string Guid = string.Empty;
			/// <summary>
			/// 成员请求控制主帐号此住宅时请求基地址
			/// </summary>
			@@ -227,32 +96,21 @@
			/// 成员请求控制主帐号此住宅时请求基地址的LoginAccessToken的值
			/// </summary>
			public string AdminRequestToken = string.Empty;
			/// <summary>
			/// 固件名称
			/// <summary>
			/// 远程连接的Mqtt的客户端ID
			/// </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]
			public string ConnEmqClientId = string.Empty;
			/// <summary>
			/// 当前登录的账号是不是之前的账号
			/// </summary>
			[Newtonsoft.Json.JsonIgnore]
			public bool TheSameLoginAccount = false;

			[Newtonsoft.Json.JsonIgnore]
			/// <summary>
			/// 当前帐号的Token
			/// </summary>
			private string Token1 = "";
			public string Token
			{
			get
			@@ -278,14 +136,14 @@
			}

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

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

			public string HomeId = string.Empty;


			[Newtonsoft.Json.JsonIgnore]
			private House m_Home = null;
			/// <summary>
			@@ -301,7 +159,7 @@
			{
			return m_Home;
			}
			m_Home = House.GetHouseByHouseId(HomeId);
			m_Home = Phone.UserCenter.HdlResidenceLogic.Current.GetHouseByHouseId(HomeId);
			if (m_Home == null)
			{
			m_Home = new House();
			@@ -333,6 +191,8 @@
			/// </summary>
			public void Save()
			{
			//加密,不能保存明码
			this.PasswordEncrypt = Phone.UserCenter.UserCenterLogic.EncryptPassword("hD1(La3o", this.Password);
			var bytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
			Shared.IO.FileUtils.WriteFileByBytes(fileName, bytes);
			ReFresh();