~wxr/CrabtreeOn.git

			@@ -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),
			@@ -134,10 +141,10 @@
			Button btnShowPassword = new Button () {
			X = etPasswrod.Right,
			Y = etPasswrod.Y + Application.GetRealHeight (12),
			Width = Application.GetRealWidth (73),
			Height = Application.GetRealHeight (60),
			UnSelectedImagePath = "CrabtreeAdd/ShowPW.png",
			SelectedImagePath = "CrabtreeAdd/HidePW.png",
			Width = Application.GetMinRealAverage (73),
			Height = Application.GetMinRealAverage (60),
			UnSelectedImagePath = "CrabtreeAdd/HidePW.png",
			SelectedImagePath = "CrabtreeAdd/ShowPW.png",
			BorderColor = SkinStyle.Current.Transparent,
			BorderWidth = 2,
			Radius = 1
			@@ -255,7 +262,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 +286,7 @@

			} catch (Exception ex) {
			MainPage.FailureToServer ();
			Console.WriteLine (ex.Message);
			Utlis.WriteLine (ex.Message);
			} finally {
			Application.RunOnMainThread (() => {
			MainPage.Loading.Hide ();
			@@ -428,14 +435,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 +460,7 @@
			Name = revertData.Contact,
			Guid = revertData.Guid,
			MD5PWD = revertData.MD5PWD,



			};
			//var se = new service.hdlcontrol.com_push.WebServicePush ();
			@@ -464,7 +478,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 +500,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 +516,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);
			////获取当前住宅网关方案
			@@ -584,18 +615,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 {