~wjc/HomeApp.git

			@@ -9,7 +9,7 @@
			{
			public AddCondition()
			{
			Tag = "LockLogic";
			Tag = "Logic";
			}
			Button selectedIcon = new Button();
			VerticalRefreshLayout middle;
			@@ -17,65 +17,20 @@

			public void Show()
			{
			#region 最上面的布局代码
			var topRowLayout = new RowLayout
			{
			BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
			Height = Application.GetRealHeight(184),
			LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
			};
			this.AddChidren(topRowLayout);

			var titleName = new Button
			{
			TextSize = 17,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			TextAlignment = TextAlignment.CenterLeft,
			X = Application.GetRealWidth(176),
			Width = Application.GetRealWidth(600),
			Height = Application.GetRealHeight(69),
			Y = Application.GetRealHeight(92),
			TextID = MyInternationalizationString.userlist,
			//Text = "选择用户",
			};
			topRowLayout.AddChidren(titleName);

			var clickBtn = new Button
			{
			Width = Application.GetRealWidth(81 + 51),
			Height = Application.GetRealHeight(58 + 40),
			Y = Application.GetRealHeight(98 - 40),
			};
			topRowLayout.AddChidren(clickBtn);
			clickBtn.MouseDownEventHandler += (sender, e) =>
			{
			RemoveFromParent();
			};

			var back = new Button
			{
			Width = Application.GetRealWidth(30),
			Height = Application.GetRealHeight(51),
			X = Application.GetRealWidth(81),
			Y = Application.GetRealHeight(98),
			//Gravity = Gravity.CenterVertical;
			UnSelectedImagePath = "ZigeeLogic/back.png",
			};
			topRowLayout.AddChidren(back);
			back.MouseDownEventHandler += (sender, e) =>
			{
			RemoveFromParent();
			};

			#endregion

			#region 界面布局代码
			TopView view = new TopView();
			this.AddChidren(view.TopRowView());
			view.toptitleNameBtn.TextID = MyInternationalizationString.userlist;
			view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
			middle = new VerticalRefreshLayout
			{
			Y = topRowLayout.Bottom,
			Y = view.topRowLayout.Bottom,
			Height = Application.GetRealHeight(1920 - 184),
			BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
			};
			this.AddChidren(middle);
			#endregion
			middle.BeginHeaderRefreshingAction += () =>
			{
			//重新刷新logic列表
			@@ -86,6 +41,7 @@
			{
			///从列表移除当前门锁全部的旧数据；
			Send.LockList.Remove(Send.LockList[i]);
			i--;
			}
			}
			Read();
			@@ -98,7 +54,7 @@
			/// <summary>
			/// 读取当前门锁的云端数据；
			/// </summary>
			public async void Read()
			public void Read()
			{
			bool d = false;
			string macport = Send.CurrentDoorLock.DeviceAddr + "_" + Send.CurrentDoorLock.DeviceEpoint.ToString();
			@@ -112,20 +68,33 @@
			}
			}
			CommonPage.Loading.Start();
			if (!d)
			middle.RemoveAll();
			System.Threading.Tasks.Task.Run(async () =>
			{
			var allMemberslist = await Send.AllMembers(Send.CurrentDoorLock.DeviceAddr);
			Send.LockList.AddRange(allMemberslist);
			}
			UserAllView(macport);
			CommonPage.Loading.Hide();
			try
			{
			if (!d)
			{
			var allMemberslist = await Send.AllMembers(macport);
			Send.LockList.AddRange(allMemberslist);
			}
			}
			catch { }
			finally
			{
			Application.RunOnMainThread(() =>
			{
			CommonPage.Loading.Hide();
			UserAllView(macport);
			});
			}
			});
			}
			/// <summary>
			/// 显示所有用户
			/// </summary>
			public void UserAllView(string macport)
			{

			for (int i = 0; i < Send.LockList.Count; i++)
			{
			var user = Send.LockList[i];
			@@ -133,55 +102,24 @@
			{
			continue;
			}
			var userFramelayout = new FrameLayout

			FunView userView = new FunView();
			userView.iconBtn.Visible = false;
			userView.funnameBtn.X = Application.GetRealWidth(81);
			userView.funnameBtn.Text = user.UserName;
			userView.funnextBtn.X = Application.GetRealWidth(1080 - 81 - 58);
			userView.lineBtn.X = Application.GetRealWidth(81);
			userView.lineBtn.Width = Application.GetRealWidth(1080 - 81 - 58);
			if (Send.LockList.Count - 1 == i)
			{
			Height = Application.GetRealHeight(160),
			BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
			};
			middle.AddChidren(userFramelayout);

			var userRow = new RowLayout
			{
			Y = Application.GetRealHeight(30),
			Width = Application.GetRealWidth(1080 - 58 - 58),
			Height = Application.GetRealHeight(130),
			X = Application.GetRealWidth(58),
			LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
			};
			userFramelayout.AddChidren(userRow);

			var usernameBtn = new Button
			{
			Text = user.UserName,
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			Width = Application.GetRealWidth(600),
			Height = Application.GetRealHeight(130),
			Tag = Send.LockList[i],
			TextSize = 14,
			};
			userRow.AddChidren(usernameBtn);

			var btntimeback = new Button
			{
			Width = Application.GetRealWidth(58),
			Height = Application.GetRealHeight(58),
			UnSelectedImagePath = "ZigeeLogic/next.png",
			X = userRow.Width - Application.GetRealWidth(58),
			Gravity = Gravity.CenterVertical,
			};
			userRow.AddChidren(btntimeback);


			EventHandler<MouseEventArgs> userclick = (sender, e) =>
			userView.funFrameLayout.Height = Application.GetRealHeight(160 + 20);//最后一行增加20高度;
			userView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
			}
			middle.AddChidren(userView.FunFrameView());
			userView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
			{
			SelectedUserID(user);
			};
			usernameBtn.MouseUpEventHandler += userclick;
			btntimeback.MouseUpEventHandler += userclick;
			userFramelayout.MouseUpEventHandler += userclick;
			userRow.MouseUpEventHandler += userclick;


			}
			}
			@@ -265,13 +203,27 @@
			lockRow.AddChidren(Btncomplete);
			#endregion

			string SelectedLockStatus = "";

			lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * membershipIfon.UserIdMode.Count) - 20 - 50);
			lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * membershipIfon.UserIdMode.Count) + 20 + 50);
			if (membershipIfon.UserIdMode.Count > 9)
			{
			///元素超出10个，暂时默认显示10;
			lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * 9) - 20 - 50);
			lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * 9) + 20 + 50);
			}
			string SelectedLockStatus = "";
			///定义两个变量记录选中状态；
			string attriButeId = "";
			string attriButeData2 = "";
			string modeName = "";

			///定两个变量记录之前的只值；
			string userId = "";
			string openMode = "";
			string accountName = "";
			string SelectedDeviceStatuscondition = "";

			for (int j = 0; j < membershipIfon.UserIdMode.Count; j++)
			{
			var userIdmode = membershipIfon.UserIdMode[j];
			@@ -323,8 +275,8 @@
			selectedIcon.Visible = false;
			selectedIcon = doorlockSelected;
			doorlockSelected.Visible = true;
			//doorlockBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
			attriButeId = userIdmode.OpenMode.ToString();
			//doorlockBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
			attriButeId = userIdmode.OpenMode.ToString();
			attriButeData2 = userIdmode.UserId;
			modeName = userIdmode.ModeName;
			};
			@@ -332,6 +284,30 @@
			doorlockBtn.MouseUpEventHandler += doorlockclick;
			doorlockSelected.MouseUpEventHandler += doorlockclick;
			doorlockfra.MouseUpEventHandler += doorlockclick;

			if (string.IsNullOrEmpty(doorlockBtn.Text))
			{
			string strname = "";
			switch (userIdmode.OpenMode)
			{
			case 0:
			{
			strname = Language.StringByID(MyInternationalizationString.lockpassword);
			}
			break;
			case 3:
			{
			strname = Language.StringByID(MyInternationalizationString.ic);
			}
			break;
			case 15:
			{
			strname = Language.StringByID(MyInternationalizationString.fingerprint);
			}
			break;
			}
			doorlockBtn.Text = userIdmode.UserId + strname;
			}
			///显示之前的状态
			if (conditionsIndex != -1)
			{
			@@ -347,6 +323,7 @@
			}
			}


			Btncomplete.MouseUpEventHandler += (sender, e) =>
			{
			var lockConditionsInfo = new Dictionary<string, string>();
			@@ -361,7 +338,8 @@
			lockConditionsInfo.Add("Range", "0");
			var accounts = new Dictionary<string, string>();
			accounts.Add("Type", "1");
			accounts.Add("Account", membershipIfon.UserName + modeName);
			accounts.Add("Account", Config.Instance.Guid);
			accounts.Add("AccountName", membershipIfon.UserName + modeName);
			accounts.Add("UserId", attriButeData2);
			if (SelectedLockStatus != "")
			{
			@@ -383,10 +361,6 @@
			}
			}
			}
			if (!addCondition)
			{
			Common.Logic.CurrentLogic.Conditions.Add(lockConditionsInfo);
			}

			for (int i = 0; i < Common.Logic.CurrentLogic.Accounts.Count; i++)
			{
			@@ -399,8 +373,12 @@
			}
			}
			}
			if (!addCondition)
			{//没有存在数据新加
			Common.Logic.CurrentLogic.Conditions.Add(lockConditionsInfo);
			}
			if (!addAccount)
			{
			{//没有存在数据新加
			Common.Logic.CurrentLogic.Accounts.Add(accounts);
			}
			}
			@@ -431,9 +409,9 @@
			{
			if (conditionsIndex == -1)
			{
			var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
			Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
			Language.StringByID(MyInternationalizationString.complete));
			var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
			Language.StringByID(MyInternationalizationString.usertip),
			Language.StringByID(MyInternationalizationString.confrim));
			alert.Show();
			return;
			}
			@@ -444,6 +422,6 @@
			lockLogicCommunalPage.Show(() => { });
			};
			}


			}
			}