~wjc/HomeApp.git

old mode 100644 new mode 100755

			@@ -261,7 +261,8 @@
			Y = Application.GetRealHeight(1737),
			Width = Application.GetMinRealAverage(115),
			Height = Application.GetMinRealAverage(115),
			UnSelectedImagePath = "Account/Wechat.png"
			UnSelectedImagePath = "Account/Wechat.png",
			Gravity=Gravity.CenterHorizontal
			};
			midFrameLayout.AddChidren(wechatBtn);

			@@ -273,7 +274,7 @@
			Height = Application.GetMinRealAverage(115),
			UnSelectedImagePath = "Account/QQ.png"
			};
			midFrameLayout.AddChidren(qqBtn);
			//midFrameLayout.AddChidren(qqBtn);

			#endregion

			@@ -323,7 +324,7 @@
			}
			else
			{
			Login(phoneRow.AccountET.Text.Trim(), pwdRow.PasswrodET.Text.Trim());
			Login(emailRow.AccountET.Text.Trim(), pwdRow.PasswrodET.Text.Trim());
			}

			}
			@@ -366,27 +367,20 @@
			{
			return;
			}
			this.RemoveFromParent();

			UserPage.Instance.Fresh();
			HomePage.Instance.ShowLoginLoadView();

			new System.Threading.Thread(async () =>
			{
			//启动ZigBee
			ZigBee.Common.Application.Init();
			//存储数据
			var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(revertObj.ResponseData.ToString());
			var revertData = responseDataObj;
			Config.ReFresh();
			Config.Instance.Account = revertData.Account;
			Config.Instance.MqttKey = revertData.MqttKey;
			Config.Instance.Password = passwordStr;
			Config.Instance.MD5PWD = revertData.MD5PWD;
			Config.Instance.Guid = revertData.Guid;
			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);
			@@ -394,15 +388,18 @@
			Config.Instance.Save();

			var resultRegID = await Shared.Common.CommonPage.Instance.PushRegID();
			var homes = await House.GetHomeLists();
			var homes = await House.GetHomeLists();
			//启动ZigBee
			ZigBee.Common.Application.Init();
			//刷新个人中心的内存及线程
			await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
			Shared.Common.Room.CanInitAllRoom = true;
			Shared.Common.Room.InitAllRoom();
			Application.RunOnMainThread(() =>
			{
			UserPage.Instance.Fresh();
			CommonPage.Loading.Hide();
			this.RemoveFromParent();
			CommonPage.Instance.RemoveViewByTag("Login");
			UserPage.Instance.Fresh();
			});
			})
			{ IsBackground = true }.Start();
			@@ -485,15 +482,15 @@
			private void LoginByWechat(object sender, MouseEventArgs mouseEventArgs)
			{
			#if Android
			var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP),
			Language.StringByID(R.MyInternationalizationString.LoginByWechat),
			Language.StringByID(R.MyInternationalizationString.Cancel),
			Language.StringByID(R.MyInternationalizationString.Confrim));
			alert.Show();
			alert.ResultEventHandler += (send, e) =>
			{
			if (e)
			{
			//var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP),
			// Language.StringByID(R.MyInternationalizationString.LoginByWechat),
			// Language.StringByID(R.MyInternationalizationString.Cancel),
			// Language.StringByID(R.MyInternationalizationString.Confrim));
			//alert.Show();
			//alert.ResultEventHandler += (send, e) =>
			//{
			//if (e)
			//{
			com.hdl.home.Application.WXLogin();
			com.hdl.home.WXEntryActivity.RespAction = (authStr) =>
			{
			@@ -505,25 +502,25 @@
			{
			new System.Threading.Thread(async () =>
			{

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

			//UserPage.Instance.Fresh();
			//启动ZigBee
			ZigBee.Common.Application.Init();
			Application.RunOnMainThread(() =>
			{
			//直接登录
			HomePage.Instance.ShowLoginLoadView();
			});
			var resultRegID = await Shared.Common.CommonPage.Instance.PushRegID();
			var homes = await House.GetHomeLists();
			var homes = await House.GetHomeLists();
			//启动ZigBee
			ZigBee.Common.Application.Init();
			//刷新个人中心的内存及线程
			await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
			Shared.Common.Room.CanInitAllRoom = true;
			Shared.Common.Room.InitAllRoom();
			Application.RunOnMainThread(() =>
			{
			this.RemoveFromParent();
			CommonPage.Instance.RemoveViewByTag("Login");
			UserPage.Instance.Fresh();
			});
			}
			@@ -541,11 +538,63 @@
			})
			{ IsBackground = true }.Start();
			}
			};
			};
			//}
			//};
			#endif

			#if iOS
			Home.IOS.AppDelegate.WXLogin();
			Home.IOS.AppDelegate.RespAction = (authStr) =>
			{
			if (authStr == null)
			{

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

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

			//UserPage.Instance.Fresh();
			var resultRegID = await Shared.Common.CommonPage.Instance.PushRegID();
			var homes = await House.GetHomeLists();
			//启动ZigBee
			ZigBee.Common.Application.Init();
			//刷新个人中心的内存及线程
			await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
			Shared.Common.Room.InitAllRoom();
			Application.RunOnMainThread(() =>
			{
			this.RemoveFromParent();
			UserPage.Instance.Fresh();
			});
			}
			else
			{
			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>
			@@ -586,11 +635,7 @@
			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);