~wjc/HomeApp.git

			@@ -353,7 +353,7 @@
			{
			if (Common.Logic.CurrentLogic.Accounts[a]["UserId"] == conditions["AttriButeData2"])
			{
			devicestatus.Text = Common.Logic.CurrentLogic.Accounts[a]["Account"];
			devicestatus.Text = Common.Logic.CurrentLogic.Accounts[a]["AccountName"];
			break;
			}
			}
			@@ -374,20 +374,18 @@
			conditionsRowLayout.AddRightView(del);
			del.MouseUpEventHandler += (sender, e) =>
			{
			var alert = new Alert(Language.StringByID(MyInternationalizationString.tip), Language.StringByID(MyInternationalizationString.doyouwanttodelete),
			Language.StringByID(MyInternationalizationString.cancel), Language.StringByID(MyInternationalizationString.confrim));
			alert.ResultEventHandler += (sender1, e1) =>
			{
			if (e1)
			{
			Common.Logic.CurrentLogic.Conditions.Remove(conditions);
			var lockLogicCommunalPage = new LockLogicCommunalPage();
			UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
			UserView.HomePage.Instance.PageIndex += 1;
			lockLogicCommunalPage.Show(() => { });
			}
			};
			var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
			Language.StringByID(MyInternationalizationString.doyouwanttodelete),
			Language.StringByID(MyInternationalizationString.confrim));
			alert.Show();
			alert.ConfirmClickEvent += () =>
			{
			Common.Logic.CurrentLogic.Conditions.Remove(conditions);
			var lockLogicCommunalPage = new LockLogicCommunalPage();
			UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
			UserView.HomePage.Instance.PageIndex += 1;
			lockLogicCommunalPage.Show(() => { });
			};

			};

			@@ -940,20 +938,19 @@

			del.MouseUpEventHandler += (sender, e) =>
			{
			var alert = new Alert(Language.StringByID(MyInternationalizationString.tip), Language.StringByID(MyInternationalizationString.doyouwanttodelete),
			Language.StringByID(MyInternationalizationString.cancel), Language.StringByID(MyInternationalizationString.confrim));
			alert.ResultEventHandler += (sender1, e1) =>
			{
			if (e1)
			{
			Common.Logic.CurrentLogic.Actions.Remove(actions);
			var lockLogicCommunalPage = new LockLogicCommunalPage();
			UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
			UserView.HomePage.Instance.PageIndex += 1;
			lockLogicCommunalPage.Show(() => { });
			}
			};
			var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
			Language.StringByID(MyInternationalizationString.doyouwanttodelete),
			Language.StringByID(MyInternationalizationString.confrim));
			alert.Show();

			alert.ConfirmClickEvent += () =>
			{
			Common.Logic.CurrentLogic.Actions.Remove(actions);
			var lockLogicCommunalPage = new LockLogicCommunalPage();
			UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
			UserView.HomePage.Instance.PageIndex += 1;
			lockLogicCommunalPage.Show(() => { });
			};

			};

			@@ -1064,20 +1061,37 @@

			#endregion

			bool tag = false;//标记开关状态;
			btnswitch.MouseUpEventHandler += (sender1, e1) =>
			{
			btnswitch.IsSelected = !btnswitch.IsSelected;
			if (btnswitch.IsSelected)
			{
			tag = true;
			custompushFrameLayout.Height = Application.GetRealHeight(160);
			Common.Logic.CurrentLogic.LogicIsCustomPushText = 1;

			}
			else
			{
			tag = false;
			custompushFrameLayout.Height = Application.GetRealHeight(0);
			Common.Logic.CurrentLogic.LogicIsCustomPushText = 0;
			}
			Send.Zj(tag, Common.Logic.CurrentLogic);
			};


			if (Common.Logic.CurrentLogic.LogicIsCustomPushText == 0)
			{
			tag = false;
			btnswitch.IsSelected = false;
			custompushFrameLayout.Height = Application.GetRealHeight(0);
			}
			else
			{
			tag = true;
			btnswitch.IsSelected = true;
			custompushFrameLayout.Height = Application.GetRealHeight(160);
			}
			var saveFrameLayout = new FrameLayout
			{
			Y = middle.Bottom,
			@@ -1103,15 +1117,18 @@
			var name = logicTextBox.Text.Trim();
			if (string.IsNullOrEmpty(logicTextBox.Text.Trim()))
			{
			new Alert(Language.StringByID(MyInternationalizationString.Tip), Language.StringByID(MyInternationalizationString.PleaseEnterLogicName), Language.StringByID(MyInternationalizationString.Close)).Show();
			var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
			Language.StringByID(MyInternationalizationString.PleaseEnterLogicName),
			Language.StringByID(MyInternationalizationString.confrim));
			alert.Show();
			return;
			}
			var logicname = Common.Logic.LockLogicList.Find((logic) => Common.Logic.CurrentLogic.LogicId != logic.LogicId && logic.LogicName == name);
			if (logicname != null)
			{
			new Alert(Language.StringByID(MyInternationalizationString.Tip), Language.StringByID(MyInternationalizationString.Rename), Language.StringByID(MyInternationalizationString.Close)).Show();
			return;
			}
			//var logicname = Common.Logic.LockLogicList.Find((logic) => Common.Logic.CurrentLogic.LogicId != logic.LogicId && logic.LogicName == name);
			//if (logicname != null)
			//{
			// new Alert(Language.StringByID(MyInternationalizationString.Tip), Language.StringByID(MyInternationalizationString.Rename), Language.StringByID(MyInternationalizationString.Close)).Show();
			// return;
			//}

			Common.Logic.CurrentLogic.LogicName = name;

			@@ -1125,6 +1142,10 @@
			{
			Common.Logic.CurrentLogic.LogicId = logicifon.LogicId;
			Common.Logic.LockLogicList.Add(Common.Logic.CurrentLogic);
			if (tag)
			{
			Send.Zj(tag, Common.Logic.CurrentLogic);
			}
			}
			}
			else
			@@ -1145,6 +1166,7 @@
			}
			public void AddCondition(int value)
			{
			Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
			var addCondition = new AddCondition();
			addCondition.conditionsIndex = value;
			UserView.HomePage.Instance.AddChidren(addCondition);