~wjc/HomeApp.git

			@@ -936,26 +936,37 @@
			};
			conditionsRowLayout.AddChidren(securitystatus);

			if (conditions["EnOrWithdrawMode"] == "1")
			switch (conditions["EnOrWithdrawMode"])
			{
			conditionIcon.UnSelectedImagePath = "ZigeeLogic/withdrawal.png";
			securitystatus.Text = Language.StringByID(MyInternationalizationString.withdrawal);
			}
			else
			{
			if (conditions["ModeId"] == "1")
			{
			conditionIcon.UnSelectedImagePath = "ZigeeLogic/athome.png";
			securitystatus.Text = Language.StringByID(MyInternationalizationString.logicathomegarrison);
			case "0":
			{
			if (conditions["ModeId"] == "1")
			{
			conditionIcon.UnSelectedImagePath = "ZigeeLogic/athome.png";
			securitystatus.Text = Language.StringByID(MyInternationalizationString.logicathomegarrison);

			}
			else
			{
			conditionIcon.UnSelectedImagePath = "ZigeeLogic/leavehome.png";
			securitystatus.Text = Language.StringByID(MyInternationalizationString.logicremovehomegarrison);

			}
			}
			else
			{
			conditionIcon.UnSelectedImagePath = "ZigeeLogic/leavehome.png";
			securitystatus.Text = Language.StringByID(MyInternationalizationString.logicremovehomegarrison);
			}
			}
			break;
			case "1":
			{
			conditionIcon.UnSelectedImagePath = "ZigeeLogic/withdrawal.png";
			securitystatus.Text = Language.StringByID(MyInternationalizationString.withdrawal);
			}
			break;
			case "2":
			{
			conditionIcon.UnSelectedImagePath = "ZigeeLogic/withdrawal.png";
			securitystatus.Text = Language.StringByID(MyInternationalizationString.urgentwithdrawal);
			}
			break;
			}

			}
			break;
			case 7:
			@@ -964,7 +975,7 @@
			conditionIcon.UnSelectedImagePath = "ZigeeLogic/position.png";
			var btnlocation = new Button
			{
			Width = Application.GetRealWidth(700),
			Width = Application.GetRealWidth(250),
			TextAlignment = TextAlignment.CenterLeft,
			Gravity = Gravity.CenterVertical,
			TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
			@@ -991,11 +1002,11 @@

			var locationstatus = new Button
			{
			Width = Application.GetRealWidth(300),
			Width = Application.GetRealWidth(550),
			Height = Application.GetRealHeight(130),
			Gravity = Gravity.CenterVertical,
			TextAlignment = TextAlignment.CenterRight,
			X = Application.GetRealWidth(500),
			X = Application.GetRealWidth(250),
			TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
			TextSize = 14,
			};
			@@ -1975,18 +1986,31 @@
			btncustompush.MouseUpEventHandler += customclick;
			custompushback.MouseUpEventHandler += customclick;
			custompushRowLayout.MouseUpEventHandler += customclick;
			bool tag = false;//标记开关状态;
			btnswitch.MouseUpEventHandler += (sender1, e1) =>
			{
			btnswitch.IsSelected = !btnswitch.IsSelected;
			if (btnswitch.IsSelected)
			{
			custompushFrameLayout.Height = Application.GetRealHeight(160);
			}
			else
			{
			custompushFrameLayout.Height = Application.GetRealHeight(0);
			}
			};
			{
			btnswitch.IsSelected = !btnswitch.IsSelected;
			if (btnswitch.IsSelected)
			{
			tag = true;
			custompushFrameLayout.Height = Application.GetRealHeight(160);
			if (Common.Logic.CurrentLogic.LogicId != 0)
			{
			Send.Data("添加/更新", "/App/HomeLogicConfig", "POST");
			}

			}
			else
			{
			tag = false;
			custompushFrameLayout.Height = Application.GetRealHeight(0);
			if (Common.Logic.CurrentLogic.LogicId != 0)
			{
			Send.Data("删除", "/App/DelHomeLogicConfig", "POST");
			}

			}
			};
			#endregion


			@@ -1999,12 +2023,13 @@
			new Alert(Language.StringByID(MyInternationalizationString.Tip), Language.StringByID(MyInternationalizationString.PleaseEnterLogicName), Language.StringByID(MyInternationalizationString.Close)).Show();
			return;
			}
			var logicname = Common.Logic.LogicList.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.LogicList.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;
			bool succeed = false;
			@@ -2019,6 +2044,10 @@
			succeed = true;
			Common.Logic.CurrentLogic.LogicId = logicifon.LogicId;
			Common.Logic.LogicList.Add(Common.Logic.CurrentLogic);
			if (tag)
			{
			Send.Data("添加/更新", "/App/HomeLogicConfig", "POST");
			}
			}
			}
			else
			@@ -2578,5 +2607,9 @@
			{ IsBackground = true }.Start();

			}




			}
			}