~wjc/HomeApp.git

			@@ -25,11 +25,6 @@
			var doorLock = tempDevice as ZigBee.Device.DoorLock;
			if (doorLock.doorLockProgrammingEventNotificationCommand != null)
			{

			Application.RunOnMainThread(() =>
			{

			});
			}
			}
			}
			@@ -46,17 +41,20 @@
			}

			#region ◆ 变量申明__________________________
			ZigBee.Device.DoorLock doorLock;
			VerticalRefreshLayout bodyView;
			ZigBee.Device.DoorLock doorLock;//当前门锁
			VerticalListRefreshControl bodyView;//刷新View
			Button currentMethod;// 当前选择的方式
			Shared.Phone.UserCenter.MemberInfoRes curAccountObj;
			Shared.Phone.UserCenter.MemberInfoRes curAccountObj;//当前账户
			Button entryStatusPic;
			Button btnPicTip;
			Button btnPicTip1;
			bool isSecondDel;
			FrameLayout blankFrameLayout;
			bool isSecondDel;//是否二次删除
			FrameLayout blankFrameLayout;//空数据显示布局
			#endregion

			/// <summary>
			/// 读取门锁存储的最新数据
			/// </summary>
			void ReadDoorLockUserInfo()
			{
			System.Threading.Tasks.Task.Run(async () =>
			@@ -81,6 +79,7 @@
			// 类型区分
			TypeRefresh();
			CommonPage.Loading.Hide();
			bodyView.EndHeaderRefreshing();
			});
			}
			});
			@@ -173,8 +172,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);
			// 类型区分
			@@ -210,10 +210,12 @@
			};
			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,
			@@ -223,7 +225,7 @@
			this.midFrameLayout.AddChidren(btnLine);
			#endregion

			bodyView = new VerticalRefreshLayout()
			bodyView = new VerticalListRefreshControl(29)
			{
			Y = btnLine.Bottom,
			Height = Application.GetRealHeight(1921 - 184 - 116),
			@@ -233,11 +235,13 @@
			{
			bodyView.BeginHeaderRefreshing();
			ReadDoorLockUserInfo();
			bodyView.EndHeaderRefreshing();
			};
			BlankPicUI();
			}

			/// <summary>
			/// 空数据UI显示
			/// </summary>
			void BlankPicUI()
			{
			blankFrameLayout = new FrameLayout
			@@ -264,18 +268,19 @@
			Gravity = Gravity.CenterHorizontal,
			Visible = false,
			Y = Application.GetRealHeight(844),
			TextSize = 12,
			};
			blankFrameLayout.AddChidren(btnPicTip);

			btnPicTip1 = new Button
			{
			X = Application.GetRealWidth(397),
			Y = btnPicTip.Bottom,
			Y = Application.GetRealHeight(844 + 49),
			Text = Language.StringByID(R.MyInternationalizationString.NoPasswordInformation1),
			TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
			Gravity = Gravity.CenterHorizontal,
			Visible = false,
			BackgroundColor = 0xff00ff00,
			Visible = true,
			TextSize = 12,
			};
			blankFrameLayout.AddChidren(btnPicTip1);
			}
			@@ -295,7 +300,7 @@
			{
			var curDoorLockUser = doorLock.localDoorLockUserList[curUserId];

			if (curDoorLockUser.ConnectedAccount == "" \|\| curDoorLockUser.ConnectedAccount != curAccountObj.SubAccountDistributedMark)
			if (string.IsNullOrEmpty(curDoorLockUser.ConnectedAccount) \|\| curDoorLockUser.ConnectedAccount != curAccountObj.SubAccountDistributedMark)
			{
			continue;
			}
			@@ -328,12 +333,7 @@
			btnPicTip.Height = Application.GetRealHeight(0);
			btnPicTip1.Height = Application.GetRealHeight(0);
			blankFrameLayout.Height = Application.GetRealHeight(0);
			var frameLayoutRow = new FrameLayout()
			{
			Height = Application.GetMinRealAverage(0),
			BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
			};
			bodyView.AddChidren(frameLayoutRow);

			int i = 0;
			foreach (var curUserId in curAccountDoorLockUserList.Keys)
			{
			@@ -362,70 +362,165 @@
			break;
			}

			#region UI
			var rowFrameLayout = new RowLayout()
			#region UI
			var rowFrameLayout = new RowLayoutControl(bodyView.rowSpace / 2);
			rowFrameLayout.BackgroundColor = ZigbeeColor.Current.XMWhite;
			bodyView.AddChidren(rowFrameLayout);
			rowFrameLayout.frameTable.UseClickStatu = false;
			var btnicon = rowFrameLayout.frameTable.AddLeftIcon();
			btnicon.UnSelectedImagePath = "DoorLock/DoorLockUserPic.png";
			//上面门锁用户名称一行
			var memberText = "";
			if (string.IsNullOrEmpty(curAccountObj.UserName))
			{
			Height = Application.GetRealHeight(127 + 23),
			X = Application.GetRealWidth(58),
			Y = i * Application.GetRealHeight(150),
			Width = Application.GetRealWidth(965),
			LineColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
			BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
			};
			frameLayoutRow.AddChidren(rowFrameLayout);

			var btnPicFrameLayout = new FrameLayout()
			memberText = curAccountObj.Account;
			}
			else
			{
			Width = Application.GetRealWidth(81),
			Height = Application.GetRealHeight(81),
			X = Application.GetRealWidth(40),
			Y = Application.GetRealHeight(49),
			};
			rowFrameLayout.AddChidren(btnPicFrameLayout);

			var btnPic = new Button()
			{
			Width = Application.GetRealWidth(84),
			Height = Application.GetRealHeight(84),
			UnSelectedImagePath = "DoorLock/DoorLockUserPic.png",
			};
			btnPicFrameLayout.AddChidren(btnPic);

			memberText = curAccountObj.UserName;
			}
			//成员一行
			var btnaa = rowFrameLayout.frameTable.AddBottomView(memberText, 800);
			var btnDoorlockUser = new EditText()
			{
			Width = Application.GetRealWidth(1080 - 173),
			Width = Application.GetRealWidth(800),
			Height = Application.GetRealHeight(60),
			X = Application.GetRealWidth(173),
			Y = Application.GetRealHeight(35),
			X = btnaa.X,
			Y = rowFrameLayout.chidrenYaxis + Application.GetRealHeight(12),
			TextSize = 14,
			PlaceholderTextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
			TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
			TextAlignment = TextAlignment.CenterLeft,
			};
			rowFrameLayout.AddChidren(btnDoorlockUser);

			var btnMember = new Button()
			rowFrameLayout.frameTable.AddChidren(btnDoorlockUser, ChidrenBindMode.NotBind);
			rowFrameLayout.frameTable.AddBottomLine();
			var btndelete = rowFrameLayout.AddDeleteControl();
			btndelete.ButtonClickEvent += (sender, e) =>
			{
			Width = Application.GetRealWidth(1080 - 173),
			Height = Application.GetRealHeight(49),
			X = Application.GetRealWidth(173),
			Y = Application.GetRealHeight(95),
			TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
			TextSize = 14,
			TextAlignment = TextAlignment.CenterLeft,
			string msg = Language.StringByID(R.MyInternationalizationString.SureToDelUnlockMethod);
			var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
			alert.Show();
			//使用确认型弹框时,的回调函数
			alert.ConfirmClickEvent += async () =>
			{
			try
			{
			CommonPage.Loading.Start("");
			var passData = doorLock.SetUserAccessData(curDoorLockUser.UserID, ZigBee.Device.DoorLock.AccessType.DelCurrentUser);
			var resultData = await doorLock.DefaultControlAsync(passData);
			if (resultData != null && resultData.defaultControlResponseData != null)
			{
			if (resultData.defaultControlResponseData.status == 0 \|\| resultData.defaultControlResponseData.status == 2)
			{
			var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
			if (UserCenterResourse.UserInfo.AuthorityNo != 1)
			{
			deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
			deleteDoorLockData.IsOtherAccountCtrl = true;
			}
			if (doorLock.DeviceAddr != null)
			{
			deleteDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
			}
			deleteDoorLockData.DoorLockLocalUserId = curDoorLockUser.UserID.ToString();
			deleteDoorLockData.PrimaryId = curDoorLockUser.PrimaryId;
			deleteDoorLockData.DelDoorLockDelType = 2;
			var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
			if (result != null)
			{
			if (result.StateCode == "Success")
			{
			isSecondDel = false;
			if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
			{
			doorLock.localDoorLockAccountList.Remove(curDoorLockUser.ConnectedAccount);
			var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
			localDoorLockObj.UserID = curDoorLockUser.UserID;
			doorLock.localDoorLockUserList.Remove(curUserId);
			doorLock.ReSave();
			TypeRefresh();
			}
			}
			else
			{
			//开关图标
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
			}
			}
			else
			{
			isSecondDel = true;
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
			}
			}
			else
			{
			if (isSecondDel)
			{
			var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
			if (UserCenterResourse.UserInfo.AuthorityNo != 1)
			{
			deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
			deleteDoorLockData.IsOtherAccountCtrl = true;
			}
			if (doorLock.DeviceAddr != null)
			{
			deleteDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
			}
			deleteDoorLockData.DoorLockLocalUserId = curDoorLockUser.UserID.ToString();
			deleteDoorLockData.PrimaryId = curDoorLockUser.PrimaryId;
			deleteDoorLockData.DelDoorLockDelType = 2;
			var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
			if (result != null)
			{
			if (result.StateCode == "Success")
			{
			isSecondDel = false;
			if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
			{
			doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
			var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
			localDoorLockObj.UserID = curDoorLockUser.UserID;
			doorLock.localDoorLockUserList.Remove(curUserId);
			TypeRefresh();
			}
			}
			else
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
			}
			}
			else
			{
			isSecondDel = true;
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
			}
			}
			else
			{
			if (curDoorLockUser.UserID < 10)
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.OnlyBeDeletedOnTheDevice), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
			}
			else
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
			}
			}
			}
			}
			else
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(CommonPage.Instance);
			}
			}
			catch { }
			finally
			{
			CommonPage.Loading.Hide();
			}
			};
			};
			rowFrameLayout.AddChidren(btnMember);

			var btnDel = new Button()
			{
			Width = Application.GetRealWidth(184),
			Text = Language.StringByID(R.MyInternationalizationString.DelBindDevice),
			TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
			TextSize = 12,
			TextAlignment = TextAlignment.Center,
			BackgroundColor = Shared.Common.ZigbeeColor.Current.XMDel,
			};
			rowFrameLayout.AddRightView(btnDel);
			#endregion

			#region 数据处理
			@@ -438,7 +533,7 @@
			switch (curDoorLockUser.UnlockType)
			{
			case 0:
			if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
			if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
			{
			btnDoorlockUser.Text = curDoorLockUser.UserName;
			}
			@@ -448,7 +543,7 @@
			}
			break;
			case 3:
			if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
			if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
			{
			btnDoorlockUser.Text = curDoorLockUser.UserName;
			}
			@@ -458,7 +553,7 @@
			}
			break;
			case 15:
			if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
			if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
			{
			btnDoorlockUser.Text = curDoorLockUser.UserName;
			}
			@@ -469,14 +564,6 @@
			break;
			}

			if (curAccountObj.UserName == "" \|\| curAccountObj.UserName == null)
			{
			btnMember.Text = curAccountObj.Account;
			}
			else
			{
			btnMember.Text = curAccountObj.UserName;
			}

			Action<Shared.View> action = async (obj) =>
			{
			@@ -523,139 +610,9 @@
			}
			};
			btnDoorlockUser.EditorEnterAction += action;

			btnDel.MouseUpEventHandler += (sender, e) =>
			{
			var alert = new Alert(Language.StringByID(R.MyInternationalizationString.Tip), Language.StringByID(R.MyInternationalizationString.SureToDelUnlockMethod),
			Language.StringByID(R.MyInternationalizationString.Cancel), Language.StringByID(R.MyInternationalizationString.Confrim));
			alert.Show();
			alert.ResultEventHandler += async (sender1, e1) =>
			{
			if (e1)
			{
			try
			{
			CommonPage.Loading.Start("");
			var passData = doorLock.SetUserAccessData(curDoorLockUser.UserID, ZigBee.Device.DoorLock.AccessType.DelCurrentUser);
			var resultData = await doorLock.DefaultControlAsync(passData);
			if (resultData != null && resultData.defaultControlResponseData != null)
			{
			if (resultData.defaultControlResponseData.status == 0 \|\| resultData.defaultControlResponseData.status == 2)
			{
			var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
			if (UserCenterResourse.UserInfo.AuthorityNo != 1)
			{
			deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
			deleteDoorLockData.IsOtherAccountCtrl = true;
			}
			if (doorLock.DeviceAddr != null)
			{
			deleteDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
			}
			deleteDoorLockData.DoorLockLocalUserId = curDoorLockUser.UserID.ToString();
			deleteDoorLockData.PrimaryId = curDoorLockUser.PrimaryId;
			deleteDoorLockData.DelDoorLockDelType = 2;
			var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
			if (result != null)
			{
			if (result.StateCode == "Success")
			{
			isSecondDel = false;
			if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
			{
			doorLock.localDoorLockAccountList.Remove(curDoorLockUser.ConnectedAccount);
			var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
			localDoorLockObj.UserID = curDoorLockUser.UserID;
			doorLock.localDoorLockUserList.Remove(curUserId);
			doorLock.ReSave();
			TypeRefresh();
			}
			}
			else
			{
			//开关图标
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
			}
			}
			else
			{
			isSecondDel = true;
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
			}
			}
			else
			{
			if (isSecondDel)
			{
			var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
			if (UserCenterResourse.UserInfo.AuthorityNo != 1)
			{
			deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
			deleteDoorLockData.IsOtherAccountCtrl = true;
			}
			if (doorLock.DeviceAddr != null)
			{
			deleteDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
			}
			deleteDoorLockData.DoorLockLocalUserId = curDoorLockUser.UserID.ToString();
			deleteDoorLockData.PrimaryId = curDoorLockUser.PrimaryId;
			deleteDoorLockData.DelDoorLockDelType = 2;
			var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
			if (result != null)
			{
			if (result.StateCode == "Success")
			{
			isSecondDel = false;
			if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
			{
			doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
			var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
			localDoorLockObj.UserID = curDoorLockUser.UserID;
			doorLock.localDoorLockUserList.Remove(curUserId);
			TypeRefresh();
			}
			}
			else
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
			}
			}
			else
			{
			isSecondDel = true;
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
			}
			}
			else
			{
			if (curDoorLockUser.UserID < 10)
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.OnlyBeDeletedOnTheDevice), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
			}
			else
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
			}
			}
			}
			}
			else
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
			}
			}
			catch { }
			finally
			{
			CommonPage.Loading.Hide();
			}
			}
			};
			};
			#endregion
			i++;
			}
			frameLayoutRow.Height = i * Application.GetRealHeight(150);
			}
			}

			@@ -697,6 +654,8 @@
			var rowFrameLayout = new RowLayout()
			{
			Height = Application.GetRealHeight(150),
			LineColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
			X = Application.GetRealWidth(81),
			};
			sidelipVerticalScrolViewLayout.AddChidren(rowFrameLayout);

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

			@@ -713,8 +671,8 @@
			{
			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,
			@@ -739,6 +697,7 @@
			doorLock.ReSave();
			btnAllMethod.IsSelected = true;
			oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			oldbuttonText.IsBold = true;
			TypeRefresh();
			}
			dialog.Close();
			@@ -771,10 +730,11 @@
			break;
			}

			if (doorLock.currentUserDisplayMethod == "" && i == 0)
			if (string.IsNullOrEmpty(doorLock.currentUserDisplayMethod) && i == 0)
			{
			btnAllMethod.IsSelected = true;
			btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			btnMethodText.IsBold = true;
			oldbutton = btnAllMethod;
			oldbuttonText = btnMethodText;
			}
			@@ -782,6 +742,7 @@
			{
			btnAllMethod.IsSelected = true;
			btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			btnMethodText.IsBold = true;
			oldbutton = btnAllMethod;
			oldbuttonText = btnMethodText;
			}
			@@ -789,6 +750,7 @@
			{
			btnAllMethod.IsSelected = true;
			btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			btnMethodText.IsBold = true;
			oldbutton = btnAllMethod;
			oldbuttonText = btnMethodText;
			}
			@@ -796,6 +758,7 @@
			{
			btnAllMethod.IsSelected = true;
			btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			btnMethodText.IsBold = true;
			oldbutton = btnAllMethod;
			oldbuttonText = btnMethodText;
			}
			@@ -803,6 +766,7 @@
			{
			btnAllMethod.IsSelected = true;
			btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			btnMethodText.IsBold = true;
			oldbutton = btnAllMethod;
			oldbuttonText = btnMethodText;
			}