~wjc/HomeApp.git

			@@ -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(() => { });
			};

			};

			@@ -871,20 +869,24 @@
			//本地没有存在;
			if (sceneinof == null)
			{
			//在网关查找该场景;
			sceneinof = await Send.GetScene(int.Parse(actions["DeviceAddr"].ToString()));
			//网关没有存在;
			if (sceneinof == null)
			{

			//注解:本地和网关都不存在该场景,界面将不会显示该场景;
			//sceneinof = new SceneUI();
			//移除该场景数据;
			Common.Logic.CurrentLogic.Actions.Remove(actions);
			//移除该场景视图;
			devicesFrameLayout.RemoveFromParent();
			continue;
			}
			//实现目的:显示出来让可以自己是否删除
			sceneinof = new SceneUI();
			#region -----
			////在网关查找该场景;
			////标记问题:网络请求，存在视图加载快慢的问题；
			//sceneinof = await Send.GetScene(int.Parse(actions["DeviceAddr"].ToString()));
			////网关没有存在;
			//if (sceneinof == null)
			//{
			// //注解:本地和网关都不存在该场景,界面将不会显示该场景;
			// //sceneinof = new SceneUI();
			// //移除该场景数据;
			// Common.Logic.CurrentLogic.Actions.Remove(actions);
			// //移除该场景视图;
			// devicesFrameLayout.RemoveFromParent();
			// continue;
			//}
			#endregion
			}


			@@ -936,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(() => { });
			};

			};

			@@ -1005,23 +1006,11 @@
			Gravity = Gravity.CenterVertical,
			};
			pushswitchRowlayout.AddChidren(btnswitch);
			btnswitch.MouseUpEventHandler += (sender1, e1) =>
			{
			btnswitch.IsSelected = !btnswitch.IsSelected;
			if (btnswitch.IsSelected)
			{

			}
			else
			{

			}
			};



			var custompushFrameLayout = new FrameLayout
			{
			Height = Application.GetRealHeight(160),
			Height = Application.GetRealHeight(0),
			BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
			};
			middle.AddChidren(custompushFrameLayout);
			@@ -1072,7 +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,
			@@ -1098,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;

			@@ -1120,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