~wjc/HomeApp.git

			@@ -225,7 +225,10 @@
			lockRow.AddChidren(Btncomplete);
			#endregion
			///定两个变量记录之前的只值；
			string userId = "", openMode = "", accountname="", SelectedDeviceStatuscondition = "";
			string userId = "";
			string openMode = "";
			string accountname = "";
			string SelectedDeviceStatuscondition = "";
			lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * user.UserIdMode.Count) - 20 - 50);
			lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * user.UserIdMode.Count) + 20 + 50);
			for (int i = 0; i < user.UserIdMode.Count; i++)
			@@ -257,25 +260,7 @@
			TextSize = 14,
			};
			doorlockRow.AddChidren(doorlockBtn);
			//(1按键/3卡/15指纹)
			//switch (userifon.OpenMode.ToString())
			//{
			// case "0":
			// {
			// doorlockBtn.Text = Language.StringByID(MyInternationalizationString.lockpassword);
			// }
			// break;
			// case "3":
			// {
			// doorlockBtn.Text = Language.StringByID(MyInternationalizationString.ic);
			// }
			// break;
			// case "15":
			// {
			// doorlockBtn.Text = Language.StringByID(MyInternationalizationString.fingerprint);
			// }
			// break;
			//}

			var doorlockSelected = new Button
			{
			X = Application.GetRealWidth(860),
			@@ -301,7 +286,6 @@
			openMode = userifon.OpenMode.ToString();
			accountname = Btntitle.Text + doorlockBtn.Text;
			//doorlockBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;

			};
			doorlockRow.MouseUpEventHandler += doorlockclick;
			doorlockBtn.MouseUpEventHandler += doorlockclick;
			@@ -352,7 +336,8 @@
			}
			if (SelectedDeviceStatuscondition != "")
			{
			bool add = false;
			bool addConditions = false;
			bool addAccounts = false;
			for (int i = 0; i < Common.Logic.CurrentLogic.Conditions.Count; i++)
			{
			if (Common.Logic.CurrentLogic.Conditions[i]["Type"] == "1")
			@@ -363,26 +348,33 @@
			{
			Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
			Common.Logic.CurrentLogic.Conditions.Insert(i, deviceConditionsInfo);
			for (int j = 0; j < Common.Logic.CurrentLogic.Accounts.Count; j++)
			{
			if (Common.Logic.CurrentLogic.Accounts[j]["UserId"] == userIdstr)
			{
			Common.Logic.CurrentLogic.Accounts.RemoveAt(j);
			Common.Logic.CurrentLogic.Accounts.Insert(j, userdictionary);
			}
			}
			add = true;
			addConditions = true;
			break;
			}
			}
			}
			}
			if (!add)
			for (int j = 0; j < Common.Logic.CurrentLogic.Accounts.Count; j++)
			{
			Common.Logic.CurrentLogic.Accounts.Add(userdictionary);
			if (Common.Logic.CurrentLogic.Accounts[j]["Type"] == "1")
			{
			if (Common.Logic.CurrentLogic.Accounts[j]["UserId"] == userIdstr)
			{
			Common.Logic.CurrentLogic.Accounts.RemoveAt(j);
			Common.Logic.CurrentLogic.Accounts.Insert(j, userdictionary);
			addAccounts = true;
			break;
			}
			}
			}
			if (!addConditions)
			{
			Common.Logic.CurrentLogic.Conditions.Add(deviceConditionsInfo);
			}

			if (!addAccounts)
			{
			Common.Logic.CurrentLogic.Accounts.Add(userdictionary);
			}
			}
			else
			{