~wjc/HomeApp.git

			@@ -83,6 +83,7 @@
			/// </summary>
			public AccountLogin()
			{
			CommonPage.Instance.IsDrawerLockMode = true;
			BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
			Tag = "Login";
			}
			@@ -342,6 +343,11 @@
			{
			try
			{
			if(CheckAccount(accountStr)==false)
			{
			return;
			}

			CommonPage.Loading.Start(Language.StringByID(R.MyInternationalizationString.Logining));

			var requestObj = new SendDataToServer.LoginObj
			@@ -381,6 +387,7 @@
			Config.Instance.MD5PWD = revertData.MD5PWD;
			Config.Instance.Guid = revertData.Guid;
			Config.Instance.LoginDateTime = DateTime.Now;
			Config.Instance.LoginToken = revertData.Token;
			if (Config.Instance.AccountList.Find((obj) => obj == revertData.Account) == null)
			{
			Config.Instance.AccountList.Add(revertData.Account);
			@@ -388,11 +395,12 @@
			Config.Instance.Save();

			var resultRegID = await Shared.Common.CommonPage.Instance.PushRegID();
			var homes = await House.GetHomeLists();
			var homes = await House.GetHomeLists();
			//刷新个人中心的内存及线程
			await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
			//启动ZigBee
			ZigBee.Common.Application.Init();
			//刷新个人中心的内存及线程
			await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();

			Shared.Common.Room.InitAllRoom();
			Application.RunOnMainThread(() =>
			{
			@@ -462,6 +470,32 @@
			}

			/// <summary>
			/// CheckAccount
			/// </summary>
			/// <param name="accountStr"></param>
			/// <returns></returns>
			private bool CheckAccount(string accountStr)
			{
			if (phoneEmailForm.SelectedEmail.IsSelected)
			{
			if (AccountLogic.Instance.CheckEmail(accountStr) == false)
			{
			loginErrorBtn.TextID = R.MyInternationalizationString.TheEmailError;
			return false;
			}
			}
			else
			{
			if (AccountLogic.Instance.CheckPhone(accountStr) == false)
			{
			loginErrorBtn.TextID = R.MyInternationalizationString.ThePhoneError;
			return false;
			}
			}
			return true;
			}

			/// <summary>
			/// 通过验证码登录
			/// </summary>
			/// <param name="sender">Sender.</param>
			@@ -511,11 +545,11 @@
			HomePage.Instance.ShowLoginLoadView();
			});
			var resultRegID = await Shared.Common.CommonPage.Instance.PushRegID();
			var homes = await House.GetHomeLists();
			var homes = await House.GetHomeLists();
			//刷新个人中心的内存及线程
			await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
			//启动ZigBee
			ZigBee.Common.Application.Init();
			//刷新个人中心的内存及线程
			await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
			Shared.Common.Room.InitAllRoom();
			Application.RunOnMainThread(() =>
			{
			@@ -539,7 +573,7 @@
			{ IsBackground = true }.Start();
			}
			};
			//}
			//}
			//};
			#endif

			@@ -620,7 +654,19 @@
			AccessToken = authRes.access_token,
			RefreshToken = authRes.refresh_token,
			OpenID = authRes.openid
			};
			};
			//获取微信昵称
			var strUrl = "https://api.weixin.qq.com/sns/userinfo?access_token=" + authRes.access_token;
			strUrl += "&openid=" + authRes.openid;
			var byteData = await Common.CommonPage.Instance.DoRequestZigbeeHttpsInterface(strUrl, null, null, "GET");
			if (byteData == null)
			{
			return false;
			}
			var receipData = System.Text.Encoding.UTF8.GetString(byteData);
			var nickData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserCenter.NicknameInfo>(receipData);
			auth.UserName = nickData.nickname;

			var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(auth);
			var revertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/InsertOrUpdateAuthUser", System.Text.Encoding.UTF8.GetBytes(requestJson));
			if (revertObj == null)
			@@ -643,13 +689,13 @@
			Config.Instance.Save();
			return true;
			}
			else
			else
			{
			return false;
			}
			}




			/// <summary>
			/// phone/email 选择
			@@ -660,6 +706,7 @@
			{
			phoneEmailForm.SelectedPhone.IsSelected = phoneEmailForm.SelectedEmail.IsSelected = false;
			loginBtn.Enable = loginBtn.IsSelected = false;
			loginErrorBtn.Text = string.Empty;
			(sender as Button).IsSelected = true;
			if((sender as Button).Tag.ToString()=="Phone")
			{
			@@ -695,8 +742,6 @@
			pwdRow = new PwdLoginRowForm();
			pwdRow.Init(accountPwdFrameLayout, 29, 225);
			pwdRow.PasswrodET.TextChangeEventHandler += Pwd_TextChange;


			}
			#endregion

			@@ -724,7 +769,7 @@
			private void Register(object sender,MouseEventArgs mouseEventArgs)
			{
			var registerPage = new AccountRegister();
			Shared.Common.CommonPage.Instance.AddChidren(registerPage);
			CommonPage.Instance.AddChidren(registerPage);
			registerPage.Show();
			}

			@@ -738,7 +783,7 @@
			/// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
			private void Account_TextChange(object sender,string mouseEventArgs)
			{
			loginErrorBtn.Text = "";
			loginErrorBtn.Text = string.Empty;
			}

			/// <summary>
			@@ -748,7 +793,7 @@
			/// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
			private void Pwd_TextChange(object sender,string mouseEventArgs)
			{
			loginErrorBtn.Text = "";
			loginErrorBtn.Text = string.Empty;
			if (1 <= pwdRow.PasswrodET.Text.Trim().Length && pwdRow.PasswrodET.Text.Trim().Length <= 16 && (phoneRow.AccountET.Text.Trim().Length > 0 \|\| emailRow.AccountET.Text.Trim().Length>0))
			{
			loginBtn.Enable = loginBtn.IsSelected = true;