~wxr/CrabtreeOn.git

			@@ -57,8 +57,8 @@
			logoView.AddChidren (btnLogo);

			var accountView = new FrameLayout () {
			Width = Application.GetMinRealAverage (500),
			Height = Application.GetMinRealAverage (85),
			Width = Application.GetRealWidth (500),
			Height = Application.GetRealWidth (85),
			X = Application.GetRealWidth (70),
			Y = btnLogo.Bottom + Application.GetRealHeight (30),
			BackgroundImagePath = "Register/Register_Email_Address.png",
			@@ -78,8 +78,10 @@

			};
			#if DEBUG
			//Text = "18926269190@189.cn"
			etAccount.Text = "721343314@qq.com";
			//etAccount.Text = "18926269190@189.cn";
			//etAccount.Text = "721343314@qq.com";
			//etAccount.Text = "crabtreel12019@gmail.com";
			etAccount.Text = "2791308028@qq.com";
			#endif

			accountView.AddChidren (etAccount);
			@@ -95,8 +97,13 @@
			}
			var accountList = accountListDB.account;


			//自动填写账号
			if (string.IsNullOrEmpty (account)) {
			if (accountList.Count > 0) {
			etAccount.Text = accountList [accountList.Count - 1];
			}

			}
			var accountListView = new VerticalScrolViewLayout () {
			Width = Application.GetRealWidth (500),
			Height = Application.GetRealHeight (85 * 2),
			@@ -107,10 +114,10 @@
			};

			var passwrodView = new FrameLayout () {
			Width = Application.GetMinRealAverage (500),
			Height = Application.GetMinRealAverage (85),
			Width = Application.GetRealWidth (500),
			Height = Application.GetRealWidth (85),
			X = Application.GetRealWidth (70),
			Y = accountView.Bottom + Application.GetRealHeight (50),
			Y = accountView.Bottom + Application.GetRealWidth (50),
			BackgroundImagePath = "Register/Register_Password_kuang.png",
			};
			bodyView.AddChidren (passwrodView);
			@@ -133,11 +140,11 @@

			Button btnShowPassword = new Button () {
			X = etPasswrod.Right,
			Y = etPasswrod.Y + Application.GetRealHeight (12),
			Y = etPasswrod.Y + Application.GetRealWidth (12),
			Width = Application.GetRealWidth (73),
			Height = Application.GetRealHeight (60),
			UnSelectedImagePath = "CrabtreeAdd/ShowPW.png",
			SelectedImagePath = "CrabtreeAdd/HidePW.png",
			Height = Application.GetRealWidth (60),
			UnSelectedImagePath = "CrabtreeAdd/HidePW.png",
			SelectedImagePath = "CrabtreeAdd/ShowPW.png",
			BorderColor = SkinStyle.Current.Transparent,
			BorderWidth = 2,
			Radius = 1
			@@ -148,19 +155,19 @@
			etPasswrod.SecureTextEntry = !btnShowPassword.IsSelected;
			};

			#if DEBUG
			int NigelLoginPass = 0;
			btnLogo.MouseUpEventHandler += (sender, e) => {
			if (NigelLoginPass == 3) {
			etAccount.Text = @"464027401@qq.com";
			etPasswrod.Text = "qqqqqq";
			} else if (NigelLoginPass == 5) {
			etAccount.Text = @"Jai.singh@havells.com";
			etPasswrod.Text = "123456";
			}
			NigelLoginPass++;
			};
			#endif
			//#if DEBUG
			// int NigelLoginPass = 0;
			// btnLogo.MouseUpEventHandler += (sender, e) => {
			// if (NigelLoginPass == 3) {
			// etAccount.Text = @"464027401@qq.com";
			// etPasswrod.Text = "qqqqqq";
			// } else if (NigelLoginPass == 5) {
			// etAccount.Text = @"Jai.singh@havells.com";
			// etPasswrod.Text = "123456";
			// }
			// NigelLoginPass++;
			// };
			//#endif
			//if (accountList.Count > 0) {
			// etAccount.Text = accountList [accountList.Count-1];
			//}
			@@ -175,9 +182,9 @@

			Button btnRegister = new Button () {
			Width = Application.GetRealWidth (200),
			Height = Application.GetRealHeight (85),
			Height = Application.GetRealWidth (85),
			X = Application.GetRealWidth (70),
			Y = passwrodView.Bottom + Application.GetRealHeight (10),
			Y = passwrodView.Bottom + Application.GetRealWidth (10),
			Text = "Sign up",
			TextSize = 15,
			TextColor = SkinStyle.Current.TextColor1,
			@@ -191,9 +198,9 @@

			Button btnForgotPassword = new Button () {
			Width = Application.GetRealWidth (500 / 2),
			Height = Application.GetRealHeight (85),
			Height = Application.GetRealWidth (85),
			X = btnRegister.Right + Application.GetRealWidth (50),
			Y = passwrodView.Bottom + Application.GetRealHeight (10),
			Y = passwrodView.Bottom + Application.GetRealWidth (10),
			Text = "Forgot password?",
			TextSize = 15,
			TextColor = SkinStyle.Current.TextColor1,
			@@ -207,9 +214,9 @@

			Button btnLogin = new Button () {
			Width = Application.GetRealWidth (504),
			Height = Application.GetRealHeight (89),
			Height = Application.GetRealWidth (89),
			X = Application.GetRealWidth (60),
			Y = btnRegister.Bottom + Application.GetRealHeight (70),
			Y = btnRegister.Bottom + Application.GetRealWidth (70),
			BackgroundColor = SkinStyle.Current.MainColor,
			SelectedBackgroundColor = SkinStyle.Current.SelectedColor,
			TextID = R.MyInternationalizationString.Login,
			@@ -240,12 +247,27 @@
			});
			return;
			}

			//邮箱格式不对
			if (!CommonUtlis.Current.CheckEmail(account)) {
			Application.RunOnMainThread (() => {
			new Tip () { Text = Language.StringByID (R.MyInternationalizationString.PleaseCheckEmailAddressCorrectly), Direction = AMPopTipDirection.Up, CloseTime = 3 }.Show (btnLogo);
			});
			return;
			}

			if (string.IsNullOrEmpty (password)) {
			Application.RunOnMainThread (() => {
			new Tip () { Text = "Please enter your password.", Direction = AMPopTipDirection.Up, CloseTime = 3 }.Show (btnLogo);
			});
			return;
			}

			//检测账号是否锁定
			if (CommonConfig.Current.CheckIfLock (account)) {
			return;
			}

			System.Threading.Tasks.Task.Run (() => {
			try {
			Application.RunOnMainThread (() => {
			@@ -255,7 +277,7 @@
			MainPage.Loading.Start ("Login...");
			}
			});
			if (UserConfig.Instance.internetStatus == 0 \|\| !SystemRemote.checeInternet ()) {
			if (UserConfig.Instance.internetStatus == 0) {
			Application.RunOnMainThread (() => {
			new Tip () { Text = "Network abnormal, unable to connect to the Internet", Direction = AMPopTipDirection.Down, CloseTime = 3 }.Show (btnLogo);
			});
			@@ -279,7 +301,7 @@

			} catch (Exception ex) {
			MainPage.FailureToServer ();
			Console.WriteLine (ex.Message);
			Utlis.WriteLine (ex.Message);
			} finally {
			Application.RunOnMainThread (() => {
			MainPage.Loading.Hide ();
			@@ -428,14 +450,21 @@
			var revertObj = MainPage.RequestHttps (API.Login, requestJson);
			if (revertObj.StateCode.ToUpper() == "SUCCESS") {

			if (!accountListDB.account.Contains (account)) {
			accountListDB.account.Add (account);
			accountListDB.SaveAccountListDB ();
			//if (!accountListDB.account.Contains (account)) {
			// accountListDB.account.Add (account);
			// accountListDB.SaveAccountListDB ();
			//}

			if (accountListDB.account.Contains (account)) {
			accountListDB.account.Remove (account);
			}
			accountListDB.account.Add (account);
			accountListDB.SaveAccountListDB ();

			var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes> (revertObj.ResponseData.ToString ());
			var revertData = responseDataObj;
			MainPage.LoginUser = new UserInfo {
			LoginToken = revertData.Token,
			ID = revertData.UserId,
			MainUserId = revertData.MainUserId,
			AccountType = revertData.UserType,
			@@ -446,7 +475,7 @@
			Name = revertData.Contact,
			Guid = revertData.Guid,
			MD5PWD = revertData.MD5PWD,



			};
			//var se = new service.hdlcontrol.com_push.WebServicePush ();
			@@ -464,7 +493,8 @@
			// //当住宅为空时先提示用户新建住宅
			//} else {
			var revertRoomData = mResidenceRes.PageData;

			UserConfig.Instance.HomeLists = revertRoomData;

			if (UserConfig.Instance.CurrentRegion == null) {
			if (revertRoomData != null && revertRoomData.Count > 0) {
			var bFind = false;
			@@ -485,7 +515,13 @@
			} else {
			//2020-01-11
			var findRoom = revertRoomData.Find ((obj) => obj.Id == UserConfig.Instance.CurrentRegion.Id);
			if (findRoom == null) {
			if (findRoom != null && UserConfig.Instance.CheckThisHomeGatewaysNotEmpty (findRoom)) {
			//刷新住宅解决子账号问题
			UserConfig.Instance.CurrentRegion = findRoom;
			Room.InitAllRoom ();
			} else {

			//if (findRoom == null) {
			if (revertRoomData != null && revertRoomData.Count > 0) {
			var bFind = false;
			foreach (var mHome in revertRoomData) {
			@@ -495,19 +531,29 @@
			break;
			}
			}
			//if (!bFind) {
			// UserConfig.Instance.CurrentRegion = revertRoomData [0];
			//}
			if (!bFind) {
			UserConfig.Instance.CurrentRegion = revertRoomData [0];
			var findRoom2 = revertRoomData.Find ((obj) => obj.IsOthreShare == false);
			if (findRoom2 != null) {
			UserConfig.Instance.CurrentRegion = findRoom2;
			} else {
			UserConfig.Instance.CurrentRegion = revertRoomData [0];
			}
			}

			IO.FileUtils.DeleteAllFile ();
			}
			} else {
			//刷新住宅解决子账号问题
			UserConfig.Instance.CurrentRegion = findRoom;
			Room.InitAllRoom ();
			//}else {
			// //刷新住宅解决子账号问题
			// UserConfig.Instance.CurrentRegion = findRoom;
			// Room.InitAllRoom ();
			//}
			}

			}

			}
			////原方案
			//GetAllBindGatewarysPagger (revertRoomData);
			////获取当前住宅网关方案
			@@ -534,6 +580,10 @@
			else if (stateCodeStr == "USERNAMEORPWDERROR") {
			//账号或密码错误
			mes = ErrorCode.USERNAMEORPWDERROR;
			if (CommonConfig.Current.ErrorLockListUpdate (account)) {
			return;
			}

			} else if (stateCodeStr == "ACCOUNTNOEXISTS") {
			//账号不存在
			mes = ErrorCode.ACCOUNTNOEXISTS;
			@@ -584,18 +634,16 @@
			{
			UserConfig.Instance.SaveUserConfig ();
			MainPage.LoginUser.LastTime = DateTime.Now;
			//MainPage.IsOtherDevicesLogin = false;

			if (UserConfig.Instance.CheckHomeGatewaysNotEmpty ()) {
			UserConfig.Instance.HomeLists = revertRoomData;
			//UserConfig.Instance.HomeLists = revertRoomData;
			MainPage.LoginUser.SaveUserInfo ();
			UserConfig.Instance.SaveUserConfig ();
			//UserConfig.Instance.SaveUserConfig ();
			Scene.Refresh ();
			A31MusicModel.Refresh ();
			Application.RunOnMainThread (() => {
			Close ();
			UserMiddle.Init (false,true);
			EquipmentPublicClass.CheckLinkRemote (2);
			UserMiddle.Init (false, true);
			EquipmentPublicClass.CheckLinkRemote (UserConfig.Instance.internetStatus);
			});
			} else {

			@@ -607,6 +655,9 @@

			}




			///// <summary>
			///// 查询当前住宅网关列表
			///// </summary>