~wjc/HomeApp.git

			@@ -4,7 +4,7 @@
			using ZigBee.Device;
			namespace Shared.Phone.UserCenter.DoorLock
			{
			public class UndistributeDoorlockUserPage : DoorLockCommonLayout, ZigBee.Common.IStatus
			public class UndistributeDoorlockUserPage : DoorLockCommonLayout
			{
			/// <summary>
			/// 构造函数
			@@ -17,15 +17,36 @@
			BackgroundColor = Shared.Common.ZigbeeColor.Current.GXCTopViewBackgroundColor;
			}

			#region ◆ 变量申明__________________________
			#region 变量申明
			/// <summary>
			/// 当前门锁
			/// </summary>
			ZigBee.Device.DoorLock doorLock;
			/// <summary>
			/// 底部白色布局
			/// </summary>
			FrameLayout bottomFrameLayout;
			/// <summary>
			/// 当前类型
			/// </summary>
			string currentType = string.Empty;
			/// <summary>
			/// 本地账户列表
			/// </summary>
			List<Shared.Phone.UserCenter.MemberInfoRes> localAccountList;
			/// <summary>
			/// 滑动布局View
			/// </summary>
			VerticalRefreshLayout bodyView;
			/// <summary>
			/// 保存之前搜索到本地门锁用户列表
			/// </summary>
			Dictionary<int, DoorLockCommonInfo.LocaDoorLockObj> oldLocalDoorLockUserList = new Dictionary<int, DoorLockCommonInfo.LocaDoorLockObj>();
			#endregion

			/// <summary>
			/// 获取所有账户的门锁用户列表
			/// </summary>
			void ReadDoorLockUserInfo()
			{
			System.Threading.Tasks.Task.Run(async () =>
			@@ -35,6 +56,7 @@
			var list = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAcountUserlist(doorLock);
			if (oldLocalDoorLockUserList.Count != 0)
			{
			//如果本次没有搜索到，提示网关没有回复
			if (list.Count == 0)
			{
			Application.RunOnMainThread(() =>
			@@ -51,6 +73,7 @@
			{
			TypeRefresh();
			CommonPage.Loading.Hide();
			bodyView.EndHeaderRefreshing();
			});
			}
			});
			@@ -83,6 +106,9 @@
			}
			}

			/// <summary>
			/// 中部布局
			/// </summary>
			public void MidFrameLayoutContent()
			{
			var midTopFrameLayout = new FrameLayout()
			@@ -99,8 +125,9 @@
			Y = Application.GetRealHeight(35),
			X = Application.GetRealWidth(812 - 100),
			TextAlignment = TextAlignment.CenterRight,
			TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText,
			TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
			TextSize = 12,
			IsBold = true,
			};
			midTopFrameLayout.AddChidren(btnAllMethod);
			// 类型区分
			@@ -135,11 +162,12 @@
			SelectedImagePath = "DoorLock/UnLockSideslipIcon.png",
			};
			midTopFrameLayout.AddChidren(btnNext);
			btnNext.MouseUpEventHandler += (sender, e) =>
			EventHandler<MouseEventArgs> handerSideLip = (sender, e) =>
			{
			SideslipFramelayout();
			};

			btnNext.MouseUpEventHandler += handerSideLip;
			btnAllMethod.MouseUpEventHandler += handerSideLip;
			var btnLine = new Button
			{
			Y = midTopFrameLayout.Bottom,
			@@ -158,10 +186,12 @@
			{
			bodyView.BeginHeaderRefreshing();
			ReadDoorLockUserInfo();
			bodyView.EndHeaderRefreshing();
			};
			}

			/// <summary>
			/// 刷新列表
			/// </summary>
			void RefreshList(int unlockMethod = -1)
			{
			this.midFrameLayout.RemoveAll();
			@@ -172,7 +202,7 @@
			foreach (var curUserId in doorLock.localDoorLockUserList.Keys)
			{
			var curDoorLockUser = doorLock.localDoorLockUserList[curUserId];
			if (curDoorLockUser.ConnectedAccount != "")
			if (!string.IsNullOrEmpty(curDoorLockUser.ConnectedAccount))
			{
			continue;
			}
			@@ -243,14 +273,15 @@
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
			Gravity = Gravity.CenterVertical,
			TextSize = 15,
			};
			rowFrameLayout.AddChidren(btnText);

			var line2 = new Button()
			{
			Y = rowFrameLayout.Height - 1,
			X = Application.GetRealWidth(58),
			Width = Application.GetRealWidth(965),
			X = Application.GetRealWidth(176),
			Width = Application.GetRealWidth(847),
			Height = 1,
			BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
			};
			@@ -265,7 +296,7 @@
			switch (curDoorLockUser.UnlockType)
			{
			case 0:
			if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
			if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
			{
			btnText.Text = curDoorLockUser.UserName;
			}
			@@ -275,7 +306,7 @@
			}
			break;
			case 3:
			if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
			if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
			{
			btnText.Text = curDoorLockUser.UserName;
			}
			@@ -285,7 +316,7 @@
			}
			break;
			case 15:
			if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
			if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
			{
			btnText.Text = curDoorLockUser.UserName;
			}
			@@ -309,12 +340,14 @@
			}
			}

			//本地账户
			/// <summary>
			/// 分配本地账户
			/// </summary>
			void MatchUsersFrameLayout(ZigBee.Device.DoorLock.LocaDoorLockObj curDoorLockUser)
			{
			#region UI
			FrameLayout flMain = new FrameLayout { BackgroundColor = 0x0f000000 };
			this.midFrameLayout.AddChidren(flMain);
			this.AddChidren(flMain);
			flMain.MouseUpEventHandler += (sender11, e11) =>
			{
			flMain.RemoveFromParent();
			@@ -323,24 +356,24 @@
			bottomFrameLayout = new FrameLayout()
			{
			Height = Application.GetRealHeight(100),
			Y = Application.GetRealHeight(930),
			Radius = 17,
			Y = Application.GetRealHeight(1253),
			Radius = (uint)Application.GetRealHeight(100 / 2),
			BackgroundColor = ZigbeeColor.Current.XMWhite,
			};
			flMain.AddChidren(bottomFrameLayout);

			var bottomFrameLayout1 = new FrameLayout()
			{
			Height = Application.GetRealHeight(806 - 50),
			Y = Application.GetRealHeight(930 + 48),
			Height = Application.GetRealHeight(668 - 60),
			Y = Application.GetRealHeight(1253 + 58),
			BackgroundColor = ZigbeeColor.Current.XMWhite,
			};
			flMain.AddChidren(bottomFrameLayout1);

			var bottomFrameLayout2 = new FrameLayout()
			{
			Height = Application.GetRealHeight(806),
			Y = Application.GetRealHeight(930),
			Height = Application.GetRealHeight(668),
			Y = Application.GetRealHeight(1253),
			};
			flMain.AddChidren(bottomFrameLayout2);

			@@ -364,33 +397,35 @@

			var btnMatchUser = new Button
			{
			X = Application.GetRealWidth(446),
			X = Application.GetRealWidth(159),
			Y = Application.GetRealHeight(35),
			Height = Application.GetRealHeight(63),
			Width = Application.GetRealWidth(284),
			Text = Language.StringByID(R.MyInternationalizationString.MatchPerson),
			Width = Application.GetRealWidth(762),
			Text = Language.StringByID(R.MyInternationalizationString.MatchUser),
			TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
			TextSize = 16,
			TextAlignment = TextAlignment.Center,
			};
			matchUsersFrameLayout.AddChidren(btnMatchUser);

			var btnFinish = new Button
			{
			X = Application.GetRealWidth(919),
			X = Application.GetRealWidth(921),
			Y = Application.GetRealHeight(40),
			Height = Application.GetRealHeight(58),
			Width = Application.GetRealWidth(101),
			Width = Application.GetRealWidth(101 + 81),
			Text = Language.StringByID(R.MyInternationalizationString.Complete),
			TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
			TextColor = Shared.Common.ZigbeeColor.Current.XMOrange,
			TextSize = 14,
			TextAlignment = TextAlignment.CenterLeft,
			};
			matchUsersFrameLayout.AddChidren(btnFinish);

			var btnTopLine = new FrameLayout()
			{
			Height = Application.GetRealHeight(5),
			Height = 1,
			Y = Application.GetRealHeight(138),
			BackgroundColor = Shared.Common.ZigbeeColor.Current.XMGray3,
			BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
			};
			bottomFrameLayout2.AddChidren(btnTopLine);

			@@ -427,8 +462,8 @@

			var btnChoose = new Button()
			{
			Width = Application.GetRealWidth(60),
			Height = Application.GetRealHeight(60),
			Width = Application.GetMinRealAverage(60),
			Height = Application.GetMinRealAverage(60),
			X = Application.GetRealWidth(861 + 81),
			Y = Application.GetRealHeight(35),
			SelectedImagePath = "DoorLock/SelectedIcon.png",
			@@ -453,7 +488,7 @@
			btnLine.Visible = false;
			}

			if (currentAccount.UserName != "" && currentAccount.UserName != null)
			if (!string.IsNullOrEmpty(currentAccount.UserName))
			{
			btnUserName.Text = currentAccount.UserName;
			}
			@@ -466,8 +501,10 @@
			{
			if (doorLock.IsFreezeAccount[currentAccount.SubAccountDistributedMark] == true)
			{

			new Tip() { MaxWidth = 150, Text = btnUserName.Text + Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			Application.RunOnMainThread(() =>
			{
			new Tip() { MaxWidth = 150, Text = btnUserName.Text + Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			});
			return;
			}

			@@ -504,111 +541,142 @@
			bottomFrameLayout.RemoveAll();
			};

			btnFinish.MouseUpEventHandler += async (sender, e) =>
			{
			if (curAccountId == "")
			{
			flMain.RemoveFromParent();
			bottomFrameLayout.RemoveAll();
			}
			else
			{
			var addLockInfo = new ZigBee.Device.DoorLock.AddDoorLockData();
			if (UserCenterResourse.UserInfo.AuthorityNo != 1)
			{
			addLockInfo.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
			addLockInfo.IsOtherAccountCtrl = true;
			}
			addLockInfo.CloudAccountId = curAccountId;
			if (doorLock.DeviceAddr != null)
			{
			addLockInfo.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
			}
			addLockInfo.OpenLockMode = curDoorLockUser.UnlockType;
			addLockInfo.DoorLockLocalUserId = curDoorLockUser.UserID.ToString();

			switch (curDoorLockUser.UnlockType)
			{
			case 0:
			if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
			{
			addLockInfo.UserIdRemarks = curDoorLockUser.UserName;
			}
			else
			{
			addLockInfo.UserIdRemarks = Language.StringByID(R.MyInternationalizationString.Password) + "ID" + curDoorLockUser.UserID;
			}
			break;
			case 3:
			if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
			{
			addLockInfo.UserIdRemarks = curDoorLockUser.UserName;
			}
			else
			{
			addLockInfo.UserIdRemarks = Language.StringByID(R.MyInternationalizationString.IcCard) + "ID" + curDoorLockUser.UserID;
			}
			break;
			case 15:
			if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
			{
			addLockInfo.UserIdRemarks = curDoorLockUser.UserName;
			}
			else
			{
			addLockInfo.UserIdRemarks = Language.StringByID(R.MyInternationalizationString.Fingerprint) + "ID" + +curDoorLockUser.UserID;
			}
			break;
			}

			addLockInfo.EntryTime = curDoorLockUser.EntryTime;
			var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/AddDoorLock", addLockInfo);
			if (result != null)
			{
			if (result.StateCode == "Success")
			{
			//存门锁信息
			var resultList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetCloudLocalDoorLocklist(doorLock, curAccountId);
			var uList = new List<int> { };
			if (resultList != null)
			{
			foreach (var a in resultList.Keys)
			{
			uList.Add(a);
			}
			}
			var d = uList.Find((value) => { return value == curDoorLockUser.UserID; });
			if (d != null)
			{
			TypeRefresh();
			flMain.RemoveFromParent();
			bottomFrameLayout.RemoveAll();
			}
			else
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			}
			}
			else
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			flMain.RemoveFromParent();
			bottomFrameLayout.RemoveAll();
			}
			}
			else
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
			flMain.RemoveFromParent();
			bottomFrameLayout.RemoveAll();
			}
			}
			};
			btnFinish.MouseUpEventHandler += (sender, e) =>
			{
			System.Threading.Tasks.Task.Run(async () =>
			{
			try
			{
			Application.RunOnMainThread(() =>
			{
			CommonPage.Loading.Start("");
			});
			if (curAccountId == "")
			{
			Application.RunOnMainThread(() =>
			{
			flMain.RemoveFromParent();
			bottomFrameLayout.RemoveAll();
			CommonPage.Loading.Hide();
			});
			}
			else
			{
			var addLockInfo = new ZigBee.Device.DoorLock.AddDoorLockData();
			if (UserCenterResourse.UserInfo.AuthorityNo != 1)
			{
			addLockInfo.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
			addLockInfo.IsOtherAccountCtrl = true;
			}
			addLockInfo.CloudAccountId = curAccountId;
			if (doorLock.DeviceAddr != null)
			{
			addLockInfo.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
			}
			addLockInfo.OpenLockMode = curDoorLockUser.UnlockType;
			addLockInfo.DoorLockLocalUserId = curDoorLockUser.UserID.ToString();
			switch (curDoorLockUser.UnlockType)
			{
			case 0:
			if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
			{
			addLockInfo.UserIdRemarks = curDoorLockUser.UserName;
			}
			else
			{
			addLockInfo.UserIdRemarks = Language.StringByID(R.MyInternationalizationString.Password) + "ID" + curDoorLockUser.UserID;
			}
			break;
			case 3:
			if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
			{
			addLockInfo.UserIdRemarks = curDoorLockUser.UserName;
			}
			else
			{
			addLockInfo.UserIdRemarks = Language.StringByID(R.MyInternationalizationString.IcCard) + "ID" + curDoorLockUser.UserID;
			}
			break;
			case 15:
			if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
			{
			addLockInfo.UserIdRemarks = curDoorLockUser.UserName;
			}
			else
			{
			addLockInfo.UserIdRemarks = Language.StringByID(R.MyInternationalizationString.Fingerprint) + "ID" + +curDoorLockUser.UserID;
			}
			break;
			}
			addLockInfo.EntryTime = curDoorLockUser.EntryTime;
			var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/AddDoorLock", addLockInfo);
			if (result != null)
			{
			if (result.StateCode == "Success")
			{
			//存门锁信息
			var resultList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetCloudLocalDoorLocklist(doorLock, curAccountId);
			var uList = new List<int> { };
			if (resultList != null)
			{
			foreach (var a in resultList.Keys)
			{
			uList.Add(a);
			}
			}
			var d = uList.Find((value) => { return value == curDoorLockUser.UserID; });
			if (d != null)
			{
			Application.RunOnMainThread(() =>
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.DistributeSuccess), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			TypeRefresh();
			CommonPage.Loading.Hide();
			flMain.RemoveFromParent();
			bottomFrameLayout.RemoveAll();
			});
			}
			else
			{
			Application.RunOnMainThread(() =>
			{
			CommonPage.Loading.Hide();
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			});
			}
			}
			else
			{
			Application.RunOnMainThread(() =>
			{
			CommonPage.Loading.Hide();
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			});
			return;
			}
			}
			else
			{
			Application.RunOnMainThread(() =>
			{
			CommonPage.Loading.Hide();
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(btnFinish);
			});
			return;
			}
			}
			}
			catch { }
			});
			};
			}

			// 侧边导航栏
			/// <summary>
			/// 侧边导航栏搜索
			/// </summary>
			void SideslipFramelayout()
			{
			#region sidelipFrameLayout UI
			var dialog = new Dialog
			{
			};
			@@ -637,13 +705,18 @@
			Y = Application.GetRealHeight(28),
			};
			sidelipFrameLayout.AddChidren(sidelipVerticalScrolViewLayout);
			#endregion

			Button oldbutton = null;
			Button oldbuttonText = null;
			for (var i = 0; i < 4; i++)
			{
			#region rowFrameLayout UI
			var rowFrameLayout = new RowLayout()
			{
			Height = Application.GetRealHeight(150),
			LineColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
			X = Application.GetRealWidth(81),
			};
			sidelipVerticalScrolViewLayout.AddChidren(rowFrameLayout);

			@@ -651,8 +724,7 @@
			{
			Width = Application.GetRealWidth(81),
			Height = Application.GetRealHeight(81),
			X = Application.GetRealWidth(81),
			Y = Application.GetRealHeight(55),
			Y = Application.GetRealHeight(35),
			};
			rowFrameLayout.AddChidren(btnAllMethod);

			@@ -660,14 +732,16 @@
			{
			Width = Application.GetRealWidth(311),
			Height = Application.GetRealHeight(58),
			X = Application.GetRealWidth(173),
			Y = Application.GetRealHeight(69),
			X = Application.GetRealWidth(92),
			Y = Application.GetRealHeight(49),
			TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
			TextSize = 14,
			TextAlignment = TextAlignment.CenterLeft,
			};
			rowFrameLayout.AddChidren(btnMethodText);
			#endregion

			#region 数据处理
			EventHandler<MouseEventArgs> hander = (sender, e) =>
			{
			if (!btnAllMethod.IsSelected)
			@@ -685,6 +759,7 @@
			doorLock.currentUserDisplayMethod = btnMethodText.Text;
			btnAllMethod.IsSelected = true;
			oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			oldbuttonText.IsBold = true;
			TypeRefresh();
			}
			dialog.Close();
			@@ -692,70 +767,35 @@
			rowFrameLayout.MouseUpEventHandler += hander;
			btnAllMethod.MouseUpEventHandler += hander;
			btnMethodText.MouseUpEventHandler += hander;
			DisplayAllUnlockMethod(i, btnAllMethod, btnMethodText);

			switch (i)
			if (string.IsNullOrEmpty(doorLock.currentUserDisplayMethod) && i == 0)
			{
			case 0:
			btnAllMethod.UnSelectedImagePath = "DoorLock/AllMethod.png";
			btnAllMethod.SelectedImagePath = "DoorLock/AllMethodOn.png";
			btnMethodText.Text = Language.StringByID(R.MyInternationalizationString.AllMethod);
			break;
			case 1:
			btnAllMethod.UnSelectedImagePath = "DoorLock/Password.png";
			btnAllMethod.SelectedImagePath = "DoorLock/PasswordOn.png";
			btnMethodText.Text = Language.StringByID(R.MyInternationalizationString.PasswordUnlock);
			break;
			case 2:
			btnAllMethod.UnSelectedImagePath = "DoorLock/Fingerprint.png";
			btnAllMethod.SelectedImagePath = "DoorLock/FingerprintOn.png";
			btnMethodText.Text = Language.StringByID(R.MyInternationalizationString.FingerprintUnlock);
			break;
			case 3:
			btnAllMethod.UnSelectedImagePath = "DoorLock/proximityCard.png";
			btnAllMethod.SelectedImagePath = "DoorLock/proximityCardOn.png";
			btnMethodText.Text = Language.StringByID(R.MyInternationalizationString.ProximithCardUnlock);
			break;
			}

			if (doorLock.currentUserDisplayMethod == "" && i == 0)
			{
			btnAllMethod.IsSelected = true;
			btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			oldbutton = btnAllMethod;
			oldbuttonText = btnMethodText;
			CurrentSelectUnlockMethod(btnAllMethod, btnMethodText, oldbutton, oldbuttonText);
			}
			if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.AllMethod) && i == 0)
			{
			btnAllMethod.IsSelected = true;
			btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			oldbutton = btnAllMethod;
			oldbuttonText = btnMethodText;
			CurrentSelectUnlockMethod(btnAllMethod, btnMethodText, oldbutton, oldbuttonText);
			}
			if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.PasswordUnlock) && i == 1)
			{
			btnAllMethod.IsSelected = true;
			btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			oldbutton = btnAllMethod;
			oldbuttonText = btnMethodText;
			CurrentSelectUnlockMethod(btnAllMethod, btnMethodText, oldbutton, oldbuttonText);
			}
			if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.FingerprintUnlock) && i == 2)
			{
			btnAllMethod.IsSelected = true;
			btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			oldbutton = btnAllMethod;
			oldbuttonText = btnMethodText;
			CurrentSelectUnlockMethod(btnAllMethod, btnMethodText, oldbutton, oldbuttonText);
			}
			if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.ProximithCardUnlock) && i == 3)
			{
			btnAllMethod.IsSelected = true;
			btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			oldbutton = btnAllMethod;
			oldbuttonText = btnMethodText;
			CurrentSelectUnlockMethod(btnAllMethod, btnMethodText, oldbutton, oldbuttonText);
			}
			#endregion
			}
			}

			//类型区分
			/// <summary>
			/// 类型区分
			/// </summary>
			void TypeRefresh()
			{
			if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.PasswordUnlock))
			@@ -775,38 +815,5 @@
			RefreshList();
			}
			}
			#region ◆ 接口实现__________________________
			/// <summary>
			/// 处理变化事件 --将弃用改用DeviceInfoChange()
			/// </summary>
			/// <returns>The changed.</returns>
			/// <param name="common">Common.</param>
			public void Changed(CommonDevice common)
			{

			}
			/// <summary>
			/// 处理变化事件
			/// </summary>
			/// <param name="common"></param>
			/// <param name="typeTag"></param>
			public void DeviceInfoChange(CommonDevice common, string typeTag)
			{
			}
			/// <summary>
			/// Changeds the IL ogic status.
			/// </summary>
			/// <param name="logic">Logic.</param>
			public void ChangedILogicStatus(ZigBee.Device.Logic logic)
			{
			}
			/// <summary>
			/// Changeds the IS cene status.
			/// </summary>
			/// <param name="scene">Scene.</param>
			public void ChangedISceneStatus(Scene scene)
			{
			}
			#endregion
			}
			}