~xm/HomeApp.git

			@@ -35,14 +35,13 @@
			}
			view.clickBtn.MouseDownEventHandler += (sender, e) =>
			{
			//UserView.HomePage.Instance.ScrollEnabled = true;//恢复左滑
			action();
			RemoveFromParent();
			};
			var middle = new VerticalScrolViewLayout
			{
			Y = view.topRowLayout.Bottom,
			Height = Application.GetRealHeight(1920 - 184 - 180),
			Height = Application.GetRealHeight(Method.H - 184 - 180),
			BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
			};
			this.AddChidren(middle);
			@@ -140,7 +139,7 @@
			{
			var deviceinof = Method.GetCommonDevice(conditions["MacAddr"], conditions["Epoint"]);
			selecteddevice.deviceNameBtn.Visible = true;
			selecteddevice.deviceNameBtn.Text = deviceinof.DeviceEpointName;
			selecteddevice.deviceNameBtn.Text = LocalDevice.Current.GetDeviceEpointName(deviceinof);
			selecteddevice.regionNameBtn.Visible = true;
			Method.RoomNmae(selecteddevice.regionNameBtn, deviceinof);
			selecteddevice.edit.Tag = i;
			@@ -155,7 +154,7 @@
			{
			if (Common.Logic.CurrentLogic.Accounts[a]["UserId"] == conditions["AttriButeData2"])
			{
			selecteddevice.selecetddevicestateBtn.Text = Common.Logic.CurrentLogic.Accounts[a]["Account"];
			selecteddevice.selecetddevicestateBtn.Text = Common.Logic.CurrentLogic.Accounts[a]["AccountName"];
			break;
			}
			}
			@@ -177,17 +176,18 @@
			///删除控件
			selecteddevice.del.MouseUpEventHandler += (sender, e) =>
			{
			var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
			var alert = new UserCenter.ShowMsgControl(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(() => { });
			selecteddevice.selecetdFrameLayout.RemoveFromParent();
			//var lockLogicCommunalPage = new LockLogicCommunalPage();
			//UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
			//UserView.HomePage.Instance.PageIndex += 1;
			//lockLogicCommunalPage.Show(() => { });
			};
			};

			@@ -246,7 +246,7 @@
			{

			var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
			name = deviceinof.DeviceEpointName;
			name =LocalDevice.Current.GetDeviceEpointName(deviceinof);
			actiondevice.regionNameBtn.Visible = true;
			Method.RoomNmae(actiondevice.regionNameBtn, deviceinof);

			@@ -504,16 +504,95 @@
			}
			}
			break;
			case DeviceType.ColorTemperatureLight:
			{
			icon = "ZigeeLogic/nightLight.png";
			var taskList = actions["TaskList"] as List<Dictionary<string, string>>;
			if (taskList == null)
			{
			continue;
			}
			foreach (var tasks in taskList)
			{
			switch (tasks["TaskType"])
			{
			case "1":
			{
			if (tasks["Data1"] == "0")
			{
			state += Language.StringByID(MyInternationalizationString.close) + ";";
			}
			else
			{
			state += Language.StringByID(MyInternationalizationString.open) + ";";
			}
			}
			break;

			}
			}
			foreach (var tasks in taskList)
			{
			switch (tasks["TaskType"])
			{

			case "3":
			{
			var intvalue = int.Parse(tasks["Data1"]);
			var lightbrightnessvalue = (intvalue * 100) / 254;
			state += Language.StringByID(MyInternationalizationString.brightness) + lightbrightnessvalue.ToString() + "%;";
			}
			break;

			}
			}
			foreach (var tasks in taskList)
			{
			switch (tasks["TaskType"])
			{

			case "7":
			{
			if (tasks["Data1"] == "0")
			{
			state += Language.StringByID(MyInternationalizationString.buzzer) + Language.StringByID(MyInternationalizationString.close) + ";";
			}
			else
			{
			state += Language.StringByID(MyInternationalizationString.buzzer) + Language.StringByID(MyInternationalizationString.open) + ";";
			}
			}
			break;

			}
			}
			foreach (var tasks in taskList)
			{
			switch (tasks["TaskType"])
			{

			case "8":
			{
			var intvalue = int.Parse(tasks["Data1"]);
			var colorTemperatureValue = 1000000 / (intvalue * 100);
			state += Language.StringByID(MyInternationalizationString.colorTemperature) + colorTemperatureValue.ToString() + "K";
			}
			break;
			}
			}

			state = state.TrimEnd(';');//去掉最后那个";"
			}
			break;
			}


			}
			break;
			case 2:
			{
			{
			actiondevice.edit.Visible = false;//隐藏编辑按钮(场景不需要编辑)
			//在本地查找该场景;
			//在本地查找该场景;
			var sceneinof = UserCenter.HdlSceneLogic.Current.GetSceneUIBySceneId(Convert.ToInt32(actions["DeviceAddr"].ToString()));
			//本地没有存在;
			if (sceneinof == null)
			@@ -559,6 +638,7 @@
			actiondevice.selecetddevicestateBtn.Text = state;

			///编辑
			actiondevice.edit.Tag = i.ToString();
			actiondevice.edit.MouseUpEventHandler += (sender, e) =>
			{
			switch (linkType)
			@@ -569,7 +649,7 @@
			var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
			var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
			this.AddChidren(flMain);
			CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "action_lockaction");
			CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "action_lockaction", int.Parse(actiondevice.edit.Tag.ToString()));
			}
			break;

			@@ -580,7 +660,7 @@
			actiondevice.del.MouseUpEventHandler += (sender, e) =>
			{

			var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
			var alert = new UserCenter.ShowMsgControl(ShowMsgType.Confirm,
			Language.StringByID(MyInternationalizationString.doyouwanttodelete),
			Language.StringByID(MyInternationalizationString.confrim));
			alert.Show();
			@@ -588,10 +668,11 @@
			alert.ConfirmClickEvent += () =>
			{
			Common.Logic.CurrentLogic.Actions.Remove(actions);
			var lockLogicCommunalPage = new LockLogicCommunalPage();
			UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
			UserView.HomePage.Instance.PageIndex += 1;
			lockLogicCommunalPage.Show(() => { });
			actiondevice.selecetdFrameLayout.RemoveFromParent();
			//var lockLogicCommunalPage = new LockLogicCommunalPage();
			//UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
			//UserView.HomePage.Instance.PageIndex += 1;
			//lockLogicCommunalPage.Show(() => { });
			};
			};

			@@ -604,7 +685,6 @@
			Method.Push(middle);
			#endregion


			saveBtn.clickviewBtn.MouseUpEventHandler += (sender, e) =>
			{
			var name = logicTextBox.Text.Trim();
			@@ -614,12 +694,12 @@
			}
			public void AddCondition(int value)
			{
			Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
			var addCondition = new AddCondition();
			addCondition.conditionsIndex = value;
			UserView.HomePage.Instance.AddChidren(addCondition);
			UserView.HomePage.Instance.PageIndex += 1;
			addCondition.Show();

			}
			}
			}