~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -8,6 +8,7 @@
			using Shared.Phone.UserView;
			using System.Net.Http;
			using Shared.Phone.Device.CommonForm;
			using Com.Tencent.MM.Sdk.Openapi;

			namespace Shared.Phone.Device.Account
			{
			@@ -70,6 +71,14 @@
			/// 密码
			/// </summary>
			private string password;
			/// <summary>
			/// wechat
			/// </summary>
			private Button wechatBtn;
			/// <summary>
			/// qq
			/// </summary>
			private Button qqBtn;


			#endregion
			@@ -190,7 +199,7 @@
			Width = Application.GetRealWidth(942),
			Gravity = Gravity.CenterHorizontal,
			BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor,
			Radius = (uint)Application.GetRealHeight(30)
			Radius = (uint)Application.GetRealHeight(17)
			};
			midFrameLayout.AddChidren(accountPwdFL);

			@@ -230,7 +239,7 @@
			loginByCodeBtn = new Button()
			{
			X=Application.GetRealWidth(98),
			Y = Application.GetRealHeight(1431),
			Y = Application.GetRealHeight(1466),
			Width = Application.GetRealWidth(300),
			Height = Application.GetRealHeight(49),
			TextID = R.MyInternationalizationString.LoginByCode,
			@@ -243,7 +252,7 @@
			registerBtn = new Button()
			{
			X = Application.GetRealWidth(738),
			Y = Application.GetRealHeight(1431),
			Y = Application.GetRealHeight(1466),
			Width = Application.GetRealWidth(244),
			Height = Application.GetRealHeight(49),
			TextID = R.MyInternationalizationString.Register,
			@@ -252,6 +261,26 @@
			TextSize = CommonFormResouce.loginTextSize
			};
			midFrameLayout.AddChidren(registerBtn);

			wechatBtn = new Button
			{
			X = Application.GetRealWidth(395),
			Y = Application.GetRealHeight(1737),
			Width = Application.GetMinRealAverage(115),
			Height = Application.GetMinRealAverage(115),
			UnSelectedImagePath = "Account/Wechat.png"
			};
			midFrameLayout.AddChidren(wechatBtn);

			qqBtn = new Button
			{
			X = Application.GetRealWidth(567),
			Y = Application.GetRealHeight(1737),
			Width = Application.GetMinRealAverage(115),
			Height = Application.GetMinRealAverage(115),
			UnSelectedImagePath = "Account/QQ.png"
			};
			midFrameLayout.AddChidren(qqBtn);

			#endregion

			@@ -278,7 +307,10 @@
			registerBtn.MouseUpEventHandler += Register;
			//忘记密码
			forgotPasswordBtn.MouseUpEventHandler += ForgetPWD_MouseUpEvent;

			//wechat
			wechatBtn.MouseUpEventHandler += LoginByWechat;
			//qq
			qqBtn.MouseUpEventHandler += LoginByQQ;
			}

			#endregion
			@@ -446,11 +478,143 @@
			/// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
			private void LoginByCode(object sender,MouseEventArgs mouseEventArgs)
			{
			this.RemoveFromParent();
			//this.RemoveFromParent();
			var loginByCodePage = new AccountLoginByCode();
			CommonPage.Instance.AddChidren(loginByCodePage);
			loginByCodePage.Show();
			}

			/// <summary>
			/// wechat登录
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="mouseEventArgs"></param>
			private void LoginByWechat(object sender, MouseEventArgs mouseEventArgs)
			{
			#if Android
			com.hdl.home.Application.WXLogin();
			com.hdl.home.WXEntryActivity.RespAction = (authStr) =>
			{
			if (authStr == null)
			{

			}
			else
			{
			new System.Threading.Thread(async () =>
			{

			var re = await isBindAuthAsync(authStr);
			if(re)
			{
			//直接登录
			//this.RemoveFromParent();

			//UserPage.Instance.Fresh();
			//启动ZigBee
			ZigBee.Common.Application.Init();
			var resultRegID = await Shared.Common.CommonPage.Instance.PushRegID();
			var homes = await House.GetHomeLists();
			//刷新个人中心的内存及线程
			await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
			Shared.Common.Room.CanInitAllRoom = true;
			Shared.Common.Room.InitAllRoom();
			Application.RunOnMainThread(() =>
			{
			this.RemoveFromParent();
			UserPage.Instance.Fresh();
			});
			}
			else
			{
			//var authRes = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.AuthUserRes>(authStr);
			//new System.Threading.Thread(async () =>
			//{
			// var auth = new SendDataToServer.BindAuthUser
			// {
			// AccountGuid = "5573cd78-31fc-4fd7-a25a-5c3b19bdbcfe",
			// OpenID = authRes.openid
			// };
			// var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(auth);
			// var revert = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/BindAuthUserToAccount", Encoding.UTF8.GetBytes(requestJson));
			//})
			//{
			// IsBackground = true
			//}.Start();

			var authRes = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.AuthUserRes>(authStr);
			Application.RunOnMainThread(() =>
			{
			var registerPage = new AccountRegister();
			Shared.Common.CommonPage.Instance.AddChidren(registerPage);
			registerPage.OpenID = authRes.openid;
			registerPage.Show();
			});
			}
			})
			{ IsBackground = true }.Start();
			}
			};
			#endif
			}

			/// <summary>
			/// qq登录
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="mouseEventArgs"></param>
			private void LoginByQQ(object sender, MouseEventArgs mouseEventArgs)
			{

			}

			/// <summary>
			/// 是否已绑定
			/// </summary>
			/// <param name="authStr"></param>
			/// <returns></returns>
			private async System.Threading.Tasks.Task<bool> isBindAuthAsync(string authStr)
			{
			var authRes = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.AuthUserRes>(authStr);
			var auth = new SendDataToServer.AuthUser()
			{
			AccessToken = authRes.access_token,
			RefreshToken = authRes.refresh_token,
			OpenID = authRes.openid
			};
			var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(auth);
			var revertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/InsertOrUpdateAuthUser", System.Text.Encoding.UTF8.GetBytes(requestJson));
			if (revertObj == null)
			{
			return false;
			}
			var stateCodeStr = revertObj.StateCode.ToUpper();
			if (stateCodeStr == "SUCCESS")
			{
			var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(revertObj.ResponseData.ToString());
			var revertData = responseDataObj;
			Config.Instance.Account = revertData.Account;
			Config.Instance.MD5PWD = revertData.MD5PWD;
			Config.Instance.Guid = revertData.Guid;
			Config.Instance.MqttKey = revertData.MqttKey;
			Config.Instance.LoginDateTime = DateTime.Now;
			Config.Instance.ConnectZigbeeMqttBrokerPwd = revertData.ConnectZigbeeMqttBrokerPwd;
			Config.Instance.ConnectZigbeeMqttClientId = revertData.ConnectZigbeeMqttClientId;
			Config.Instance.ZigbeeMqttBrokerLoadSubDomain = revertData.ZigbeeMqttBrokerLoadSubDomain;
			if (Config.Instance.AccountList.Find((obj) => obj == revertData.Account) == null)
			{
			Config.Instance.AccountList.Add(revertData.Account);
			}
			Config.Instance.Save();
			return true;
			}
			else
			{
			return false;
			}
			}



			/// <summary>
			/// phone/email 选择
			@@ -550,7 +714,7 @@
			private void Pwd_TextChange(object sender,string mouseEventArgs)
			{
			loginErrorBtn.Text = "";
			if (1 <= pwdRow.PasswrodET.Text.Trim().Length && pwdRow.PasswrodET.Text.Trim().Length <= 16 && phoneRow.AccountET.Text.Trim().Length > 0)
			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;
			}