~wjc/HomeApp.git

			@@ -26,7 +26,6 @@
			Shared.Phone.UserCenter.MemberInfoRes curAccountObj;
			string currentType = string.Empty;
			FrameLayout bottomFrameLayout;

			#endregion

			/// <summary>
			@@ -169,7 +168,6 @@
			TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
			TextAlignment = TextAlignment.CenterLeft,
			TextSize = 14,
			Text = curAccountObj.UserName,
			};
			personRemarkRemarkFrameLayout.AddChidren(btnMatchPersonContent);

			@@ -203,6 +201,14 @@
			btnPasswordRemark.Text = Language.StringByID(R.MyInternationalizationString.ProximityRemark);
			btnPasswordRemarkContent.PlaceholderText = Language.StringByID(R.MyInternationalizationString.ProximityCard) + "-" + doorLock.doorLockProgrammingEventNotificationCommand.UserID;
			}
			if (curAccountObj.UserName != "" && curAccountObj.UserName != null)
			{
			btnMatchPersonContent.Text = curAccountObj.UserName;
			}
			else
			{
			btnMatchPersonContent.Text = curAccountObj.Account;
			}

			completeBtn.MouseDownEventHandler += async (sender, e) =>
			{
			@@ -232,47 +238,65 @@
			}
			try
			{
			Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
			var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/AddDoorLock", addLockInfo);
			if (result != null && result.StateCode == "Success")
			if (result != null)
			{
			if (doorLock.localDoorLockUserList.ContainsKey(doorLock.doorLockProgrammingEventNotificationCommand.UserID))
			if (result.StateCode == "Success")
			{
			doorLock.localDoorLockUserList.Remove(doorLock.doorLockProgrammingEventNotificationCommand.UserID);

			var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
			localDoorLockObj.UserID = doorLock.doorLockProgrammingEventNotificationCommand.UserID;
			localDoorLockObj.UnlockType = addLockInfo.OpenLockMode;
			localDoorLockObj.EntryTime = addLockInfo.EntryTime;
			localDoorLockObj.UserName = addLockInfo.UserIdRemarks;
			localDoorLockObj.ConnectedAccount = curAccountObj.SubAccountDistributedMark;
			doorLock.localDoorLockUserList.Add(doorLock.doorLockProgrammingEventNotificationCommand.UserID, localDoorLockObj);

			completeBtn.Enable = true;
			this.RemoveFromParent();

			for (int i = UserView.HomePage.Instance.ChildrenCount - 1; i >= 0; i--)
			if (doorLock.localDoorLockUserList.ContainsKey(doorLock.doorLockProgrammingEventNotificationCommand.UserID))
			{
			var form = UserView.HomePage.Instance.GetChildren(i);
			//存账户信息
			// var resultList1 = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetCloudLocalAccountlist(doorLock, curAccountObj.SubAccountDistributedMark);
			//存门锁信息
			var resultList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetCloudLocalDoorLocklist(doorLock, curAccountObj.SubAccountDistributedMark);
			if (resultList.ContainsKey(doorLock.doorLockProgrammingEventNotificationCommand.UserID) == true)
			{
			var a = resultList[doorLock.doorLockProgrammingEventNotificationCommand.UserID];
			if (a?.ConnectedAccount == curAccountObj.SubAccountDistributedMark)
			{
			completeBtn.Enable = true;
			this.RemoveFromParent();
			for (int i = UserView.HomePage.Instance.ChildrenCount - 1; i >= 0; i--)
			{
			var form = UserView.HomePage.Instance.GetChildren(i);

			if (form is UnLockMethod)
			{
			((UnLockMethod)form).RefreshList();
			break;
			}
			else
			{
			form.RemoveFromParent();
			if (form is UnLockMethod)
			{
			((UnLockMethod)form).RefreshList();
			break;
			}
			else
			{
			form.RemoveFromParent();
			}
			}
			}
			else
			{
			completeBtn.Enable = true;
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnPasswordRemarkContent);
			}
			}
			}
			}
			else
			{
			completeBtn.Enable = true;
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ModigfyFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnPasswordRemarkContent);
			}
			}
			else
			{
			completeBtn.Enable = true;
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ModigfyFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnPasswordRemarkContent);
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnPasswordRemarkContent);
			}
			}
			catch { }
			finally
			{
			CommonPage.Loading.Hide();
			}
			};
			}