~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,
			};
			@@ -284,11 +238,11 @@

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