~wjc/HomeApp.git

old mode 100644 new mode 100755

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

			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,
			IsBold = true,
			//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();
			};


			#region 上面的布局代码
			TopView view = new TopView();
			this.AddChidren(view.TopRowView());
			view.toptitleNameBtn.TextID = MyInternationalizationString.userlist;
			view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
			#endregion

			middle = new VerticalRefreshLayout
			{
			Y = topRowLayout.Bottom,
			Y = view.topRowLayout.Bottom,
			Height = Application.GetRealHeight(1920 - 184),
			BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
			};
			@@ -94,23 +48,13 @@
			//关闭刷新View；
			middle.EndHeaderRefreshing();
			};
			//Read();
			CommonPage.Loading.Start();
			new System.Threading.Thread(() =>
			{
			Application.RunOnMainThread(() =>
			{
			Read();
			CommonPage.Loading.Hide();
			});
			})
			{ IsBackground = true }.Start();
			Read();

			}
			/// <summary>
			/// 读取当前门锁的云端数据；
			/// </summary>
			public async void Read()
			public void Read()
			{
			bool d = false;
			string macport = Send.CurrentDoorLock.DeviceAddr + "_" + Send.CurrentDoorLock.DeviceEpoint.ToString();
			@@ -124,13 +68,27 @@
			}
			}
			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>
			/// 显示所有用户
			@@ -277,13 +235,21 @@
			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 = "";

			for (int j = 0; j < membershipIfon.UserIdMode.Count; j++)
			{
			var userIdmode = membershipIfon.UserIdMode[j];
			@@ -335,8 +301,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;
			};
			@@ -344,6 +310,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)
			{
			@@ -358,6 +348,7 @@

			}
			}


			Btncomplete.MouseUpEventHandler += (sender, e) =>
			{
			@@ -443,9 +434,9 @@
			{
			if (conditionsIndex == -1)
			{
			var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
			Language.StringByID(MyInternationalizationString.usertip),
			Language.StringByID(MyInternationalizationString.confrim));
			var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
			Language.StringByID(MyInternationalizationString.usertip),
			Language.StringByID(MyInternationalizationString.confrim));
			alert.Show();
			return;
			}